36d6db55b0
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline secilc-3.2..32611aea6543 -- secilc
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From 1e4e7f6a125af20c563f8c6932d210a8f5f902e9 Mon Sep 17 00:00:00 2001
|
|
From: Dominick Grift <dominick.grift@defensec.nl>
|
|
Date: Wed, 24 Mar 2021 16:11:05 +0100
|
|
Subject: [PATCH] cil_conditional_statements.md: fix expr definition
|
|
|
|
expr "(expr (tunable_id tunable_id))" does not work but "(expr
|
|
tunable_id tunable_id)" does work
|
|
|
|
for example, this works
|
|
|
|
(tunable test1)
|
|
(tunable test2)
|
|
(tunableif (or test1 test2)
|
|
(true
|
|
(allow a b (c (d)))))
|
|
|
|
but this does not work:
|
|
|
|
(tunable test1)
|
|
(tunable test2)
|
|
(tunableif (or (test1 test2))
|
|
(true
|
|
(allow a b (c (d)))))
|
|
|
|
Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
|
|
---
|
|
secilc/docs/cil_conditional_statements.md | 24 +++++++++++------------
|
|
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/secilc/docs/cil_conditional_statements.md b/secilc/docs/cil_conditional_statements.md
|
|
index a55a9b6cccd6..55f0bfd65aa8 100644
|
|
--- a/secilc/docs/cil_conditional_statements.md
|
|
+++ b/secilc/docs/cil_conditional_statements.md
|
|
@@ -78,12 +78,12 @@ Contains the run time conditional statements that are instantiated in the binary
|
|
<tr class="odd">
|
|
<td align="left"><p><code>expr</code></p></td>
|
|
<td align="left"><p>Zero or more <code>expr</code>'s, the valid operators and syntax are:</p>
|
|
-<p><code> (and (boolean_id boolean_id))</code></p>
|
|
-<p><code> (or (boolean_id boolean_id))</code></p>
|
|
-<p><code> (xor (boolean_id boolean_id))</code></p>
|
|
-<p><code> (eq (boolean_id boolean_id))</code></p>
|
|
-<p><code> (neq (boolean_id boolean_id))</code></p>
|
|
-<p><code> (not (boolean_id))</code></p></td>
|
|
+<p><code> (and boolean_id boolean_id)</code></p>
|
|
+<p><code> (or boolean_id boolean_id)</code></p>
|
|
+<p><code> (xor boolean_id boolean_id)</code></p>
|
|
+<p><code> (eq boolean_id boolean_id)</code></p>
|
|
+<p><code> (neq boolean_id boolean_id)</code></p>
|
|
+<p><code> (not boolean_id)</code></p></td>
|
|
</tr>
|
|
<tr class="even">
|
|
<td align="left"><p><code>true</code></p></td>
|
|
@@ -196,12 +196,12 @@ Compile time conditional statement that may or may not add CIL statements to be
|
|
<tr class="odd">
|
|
<td align="left"><p><code>expr</code></p></td>
|
|
<td align="left"><p>Zero or more <code>expr</code>'s, the valid operators and syntax are:</p>
|
|
-<p><code> (and (tunable_id tunable_id))</code></p>
|
|
-<p><code> (or (tunable_id tunable_id))</code></p>
|
|
-<p><code> (xor (tunable_id tunable_id))</code></p>
|
|
-<p><code> (eq (tunable_id tunable_id))</code></p>
|
|
-<p><code> (neq (tunable_id tunable_id))</code></p>
|
|
-<p><code> (not (tunable_id))</code></p></td>
|
|
+<p><code> (and tunable_id tunable_id)</code></p>
|
|
+<p><code> (or tunable_id tunable_id)</code></p>
|
|
+<p><code> (xor tunable_id tunable_id)</code></p>
|
|
+<p><code> (eq tunable_id tunable_id)</code></p>
|
|
+<p><code> (neq tunable_id tunable_id)</code></p>
|
|
+<p><code> (not tunable_id)</code></p></td>
|
|
</tr>
|
|
<tr class="even">
|
|
<td align="left"><p><code>true</code></p></td>
|
|
--
|
|
2.32.0
|
|
|