Update the cil docs to match the current behaviour.
PATCH 1/1 Update the cil docs to match the current behaviour.
Some features where dropped or change since the docs were last updated.
---secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
secilc/docs/cil_call_macro_statements.md +0 -0
@@ -44,7 +44,7 @@ macro
Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [call](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro.
-Note that when resolving macros the callers namespace is not checked, only the following places:
+When resolving macros the following places are checked in this order:
- Items defined inside the macro
@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f
- Items defined in the same namespace of the macro
+- Items defined in the callers namespace
+
- Items defined in the global namespace
**Statement definition:**
@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f
<tr class="odd">
<td align="left"><p><code>param_type</code></p></td>
<td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p>
-<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr>
<tr class="even">
<td align="left"><p><code>param_id</code></p></td>
secilc/docs/cil_container_statements.md +0 -0
@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po
in
--
-Allows the insertion of CIL statements into a named container ([block](cil_container_statements.md#block), [optional](cil_container_statements.md#optional) or [macro](cil_call_macro_statements.md#macro)). This statement is not allowed in [booleanif](cil_conditional_statements.md#booleanif) or [tunableif](cil_conditional_statements.md#tunableif) statements.
+Allows the insertion of CIL statements into a named container ([block](cil_container_statements.md#block), [optional](cil_container_statements.md#optional) or [macro](cil_call_macro_statements.md#macro)). This statement is not allowed in [booleanif](cil_conditional_statements.md#booleanif) or [tunableif](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [blockinherit](cil_conditional_statements.md#blockinherit). **Statement definition:**
Signature · 1 line
2.27.0
This patch is malformed. It looks like leading spaces and blank lines (at the very least) have been stripped.
Thanks,
Jim
Quoted 47 lines · On Mon, Jun 29, 2020 at 3:44 PM bauen1 <[email protected]> wrote:
Some features where dropped or change since the docs were last updated.
Signed-off-by bauen1 <[email protected]>---
secilc/docs/cil_call_macro_statements.md| 6 ++++--secilc/docs/cil_container_statements.md| 2 +-2 files changed, 5 insertions(+), 3 deletions(-)secilc/docs/cil_call_macro_statements.md +0
-0@@ -44,7 +44,7 @@ macroDeclare a macro in the current namespace with its associated parameters. The macro identifier is used by the [
call](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro.secilc/docs/cil_call_macro_statements.md +3
-4-Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f<tr class="odd">
<td align="left"><p><code>param_type</code></p></td>
<td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p>
-<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr>
<tr class="even">
<td align="left"><p><code>param_id</code></p></td>secilc/docs/cil_container_statements.md +0
-0@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into poin
--secilc/docs/cil_container_statements.md +1
-1-Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit).**Statement definition:**
--
2.27.0
Quoted 5 lines · James Carter
This patch is malformed. It looks like leading spaces and blank lines (at the very least) have been stripped.
Thanks,
Jim
I'm sorry.
I will resend the patch properly.
bauen1
Signature · 2 lines
bauen1 https://dn42.bauen1.xyz/
PATCH 1/1 Update the cil docs to match the current behaviour.
In reply to James CarterSome features where dropped or change since the docs were last updated.
--- secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
secilc/docs/cil_call_macro_statements.md +4 -2
@@ -44,7 +44,7 @@ macro Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro. -Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro
@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**
@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f <tr class="odd"> <td align="left"><p><code>param_type</code></p></td> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr> <tr class="even"> <td align="left"><p><code>param_id</code></p></td>
secilc/docs/cil_container_statements.md +1 -1
@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po in -- -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit). **Statement definition:**
Signature · 1 line
2.27.0
PATCH v2 1/1 Update the cil docs to match the current behaviour.
In reply to James CarterSome features where dropped or change since the docs were last updated.
---
Notes:
Updated to include additional fixes and a correct Signed-off-by line.
secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +- secilc/docs/cil_reference_guide.md | 2 +- secilc/docs/cil_user_statements.md | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)
secilc/docs/cil_call_macro_statements.md +4 -2
@@ -44,7 +44,7 @@ macro Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro. -Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro
@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**
@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f <tr class="odd"> <td align="left"><p><code>param_type</code></p></td> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr> <tr class="even"> <td align="left"><p><code>param_id</code></p></td>
secilc/docs/cil_container_statements.md +1 -1
@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po in -- -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit). **Statement definition:**
secilc/docs/cil_reference_guide.md +1 -1
@@ -176,7 +176,7 @@ Should the symbol not be prefixed with a dot, the current namespace would be sea Expressions ----------- -Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`validatetrans`](cil_constraint_statements.md#validatetrans) +Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`mlsvalidatetrans`](cil_constraint_statements.md#mlsvalidatetrans) CIL expressions use the [prefix](http://www.cs.man.ac.uk/~pjj/cs212/fix.html) or Polish notation and may be nested (note that the kernel policy language uses postfix or reverse Polish notation). The syntax is as follows, where the parenthesis are part of the syntax:
secilc/docs/cil_user_statements.md +1 -1
@@ -260,7 +260,7 @@ This example will associate `unconfined.user` with a named [`levelrange`](cil_ml (categoryorder (c0 c1)) (sensitivity s0) (sensitivity s1) - (dominance (s0 s1)) + (sensitivityorder (s0 s1)) (sensitivitycategory s0 (c0 c1)) (level systemLow (s0)) (level systemHigh (s0 (c0 c1)))
Signature · 1 line
2.27.0
Quoted 3 lines · On Thu, Jul 09, 2020 at 10:36:36AM +0200, bauen1 wrote:
Some features where dropped or change since the docs were last updated.
Signed-off-by Jonathan Hettwer <[email protected]>
I think it should go to 3.1 release. But I have to confess myself not beeing able to confirm whether the change is correct.
If it's acked somebody else I could apply it and push to 3.1 release
Quoted 84 lines
---
Notes:
Updated to include additional fixes and a correct Signed-off-by line.secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +- secilc/docs/cil_reference_guide.md | 2 +- secilc/docs/cil_user_statements.md | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)secilc/docs/cil_call_macro_statements.md +4
-2@@ -44,7 +44,7 @@ macro Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro. -Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f <tr class="odd"> <td align="left"><p><code>param_type</code></p></td> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr> <tr class="even"> <td align="left"><p><code>param_id</code></p></td>secilc/docs/cil_container_statements.md +1
-1@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po in -- -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit). **Statement definition:**secilc/docs/cil_reference_guide.md +1
-1@@ -176,7 +176,7 @@ Should the symbol not be prefixed with a dot, the current namespace would be sea Expressions ----------- -Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`validatetrans`](cil_constraint_statements.md#validatetrans) +Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`mlsvalidatetrans`](cil_constraint_statements.md#mlsvalidatetrans) CIL expressions use the [prefix](http://www.cs.man.ac.uk/~pjj/cs212/fix.html) or Polish notation and may be nested (note that the kernel policy language uses postfix or reverse Polish notation). The syntax is as follows, where the parenthesis are part of the syntax:secilc/docs/cil_user_statements.md +1
-1@@ -260,7 +260,7 @@ This example will associate `unconfined.user` with a named [`levelrange`](cil_ml (categoryorder (c0 c1)) (sensitivity s0) (sensitivity s1) - (dominance (s0 s1)) + (sensitivityorder (s0 s1)) (sensitivitycategory s0 (c0 c1)) (level systemLow (s0)) (level systemHigh (s0 (c0 c1)))Signature · 1 line
2.27.0
Quoted 10 lines · Petr Lautrbach
Quoted 3 lines · On Thu, Jul 09, 2020 at 10:36:36AM +0200, bauen1 wrote:
Some features where dropped or change since the docs were last updated.
Signed-off-by Jonathan Hettwer <[email protected]>I think it should go to 3.1 release. But I have to confess myself not beeing able to confirm whether the change is correct.
If it's acked somebody else I could apply it and push to 3.1 release
Thanks, but please don't let this alone block the release.
Signature · 2 lines
bauen1 https://dn42.bauen1.xyz/
Quoted 4 lines · On Thu, Jul 9, 2020 at 4:37 AM bauen1 <[email protected]> wrote:
Some features where dropped or change since the docs were last updated.
Signed-off-by Jonathan Hettwer <[email protected]>
Quoted 84 lines
---
Notes:
Updated to include additional fixes and a correct Signed-off-by line.secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +- secilc/docs/cil_reference_guide.md | 2 +- secilc/docs/cil_user_statements.md | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)secilc/docs/cil_call_macro_statements.md +4
-2@@ -44,7 +44,7 @@ macro Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro. -Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f <tr class="odd"> <td align="left"><p><code>param_type</code></p></td> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr> <tr class="even"> <td align="left"><p><code>param_id</code></p></td>secilc/docs/cil_container_statements.md +1
-1@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po in -- -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit). **Statement definition:**secilc/docs/cil_reference_guide.md +1
-1@@ -176,7 +176,7 @@ Should the symbol not be prefixed with a dot, the current namespace would be sea Expressions ----------- -Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`validatetrans`](cil_constraint_statements.md#validatetrans) +Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`mlsvalidatetrans`](cil_constraint_statements.md#mlsvalidatetrans) CIL expressions use the [prefix](http://www.cs.man.ac.uk/~pjj/cs212/fix.html) or Polish notation and may be nested (note that the kernel policy language uses postfix or reverse Polish notation). The syntax is as follows, where the parenthesis are part of the syntax:secilc/docs/cil_user_statements.md +1
-2@@ -260,7 +260,7 @@ This example will associate `unconfined.user` with a named [`levelrange`](cil_ml (categoryorder (c0 c1)) (sensitivity s0) (sensitivity s1) - (dominance (s0 s1)) + (sensitivityorder (s0 s1)) (sensitivitycategory s0 (c0 c1)) (level systemLow (s0)) (level systemHigh (s0 (c0 c1))) --2.27.0
Quoted 7 lines · James Carter
Quoted 4 lines · On Thu, Jul 9, 2020 at 4:37 AM bauen1 <[email protected]> wrote:
Some features where dropped or change since the docs were last updated.
Signed-off-by Jonathan Hettwer <[email protected]>Acked-by James Carter <[email protected]>
I'd asked for that and then missed it, I'm sorry.
It's applied now. Thanks!
Quoted 85 lines
Quoted 84 lines
---
Notes:
Updated to include additional fixes and a correct Signed-off-by line.secilc/docs/cil_call_macro_statements.md | 6 ++++-- secilc/docs/cil_container_statements.md | 2 +- secilc/docs/cil_reference_guide.md | 2 +- secilc/docs/cil_user_statements.md | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)secilc/docs/cil_call_macro_statements.md +4
-2@@ -44,7 +44,7 @@ macro Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro. -Note that when resolving macros the callers namespace is not checked, only the following places: +When resolving macros the following places are checked in this order: - Items defined inside the macro@@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f - Items defined in the same namespace of the macro +- Items defined in the callers namespace + - Items defined in the global namespace **Statement definition:**@@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f <tr class="odd"> <td align="left"><p><code>param_type</code></p></td> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td> </tr> <tr class="even"> <td align="left"><p><code>param_id</code></p></td>secilc/docs/cil_container_statements.md +1
-1@@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po in -- -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit). **Statement definition:**secilc/docs/cil_reference_guide.md +1
-1@@ -176,7 +176,7 @@ Should the symbol not be prefixed with a dot, the current namespace would be sea Expressions ----------- -Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`validatetrans`](cil_constraint_statements.md#validatetrans) +Expressions may occur in the following CIL statements: [`booleanif`](cil_conditional_statements.md#booleanif), [`tunableif`](cil_conditional_statements.md#tunableif), [`classpermissionset`](cil_class_and_permission_statements.md#classpermissionset), [`typeattributeset`](cil_type_statements.md#typeattributeset), [`roleattributeset`](cil_role_statements.md#roleattributeset), [`categoryset`](cil_mls_labeling_statements.md#categoryset), [`constrain`](cil_constraint_statements.md#constrain), [`mlsconstrain`](cil_constraint_statements.md#mlsconstrain), [`validatetrans`](cil_constraint_statements.md#validatetrans), [`mlsvalidatetrans`](cil_constraint_statements.md#mlsvalidatetrans) CIL expressions use the [prefix](http://www.cs.man.ac.uk/~pjj/cs212/fix.html) or Polish notation and may be nested (note that the kernel policy language uses postfix or reverse Polish notation). The syntax is as follows, where the parenthesis are part of the syntax:secilc/docs/cil_user_statements.md +1
-2@@ -260,7 +260,7 @@ This example will associate `unconfined.user` with a named [`levelrange`](cil_ml (categoryorder (c0 c1)) (sensitivity s0) (sensitivity s1) - (dominance (s0 s1)) + (sensitivityorder (s0 s1)) (sensitivitycategory s0 (c0 c1)) (level systemLow (s0)) (level systemHigh (s0 (c0 c1))) --2.27.0