RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '847aa150e30e6147c28ed9807fae4dc232b5a8fe'

This commit is contained in:
Steve Lawrence 2014-10-06 14:55:04 -04:00
parent 84d9486eb2 847aa150e3
commit 450a3ea216
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsepol/cil/docs/CIL_Reference_Guide.xml
View File

@ -215,7 +215,7 @@ expr_set = (name ... | expr ...)
expr = (expr_key expr_set ...)
expr_key = and | or | xor | not | all | eq | neq | dom | domby | incomp | range]]>
</programlisting>
<para>The number of <literal>expr_set</literal>'s in an <literal>expr</literal> is dependent on the statement type (there are four different classes as defined below) that also influence the valid <literal>expr_key</literal> entries (e.g. <literal>dom</literal>, <literal>domby</literal>, <literal>incomp</literal> are only allowed in constraint statments).</para>
<para>The number of <literal>expr_set</literal>'s in an <literal>expr</literal> is dependent on the statement type (there are four different classes as defined below) that also influence the valid <literal>expr_key</literal> entries (e.g. <literal>dom</literal>, <literal>domby</literal>, <literal>incomp</literal> are only allowed in constraint statements).</para>
<informaltable frame="all">
<tgroup cols="5"><tbody>

4
libsepol/cil/src/cil_build_ast.c
View File

@ -5511,7 +5511,7 @@ int __cil_build_ast_node_helper(struct cil_tree_node *parse_current, uint32_t *f
rc = SEPOL_ERR;
cil_log(CIL_ERR, "Found tunable at line %d of %s\n",
parse_current->line, parse_current->path);
cil_log(CIL_ERR, "Tunables cannot be defined within macro statment\n");
cil_log(CIL_ERR, "Tunables cannot be defined within macro statement\n");
goto exit;
}
@ -5519,7 +5519,7 @@ int __cil_build_ast_node_helper(struct cil_tree_node *parse_current, uint32_t *f
rc = SEPOL_ERR;
cil_log(CIL_ERR, "Found in at line %d of %s\n",
parse_current->line, parse_current->path);
cil_log(CIL_ERR, "in-statements cannot be defined within macro statment\n");
cil_log(CIL_ERR, "in-statements cannot be defined within macro statement\n");
goto exit;
}
}

4
libsepol/cil/src/cil_resolve_ast.c
View File

@ -3181,7 +3181,7 @@ int __cil_resolve_ast_node_helper(struct cil_tree_node *node, __attribute__((unu
if (optstack != NULL) {
if (node->flavor == CIL_TUNABLE || node->flavor == CIL_MACRO) {
/* tuanbles and macros are not allowed in optionals*/
cil_log(CIL_ERR, "%s statment is not allowed in optionals (%s:%d)\n", cil_node_to_string(node), node->path, node->line);
cil_log(CIL_ERR, "%s statement is not allowed in optionals (%s:%d)\n", cil_node_to_string(node), node->path, node->line);
rc = SEPOL_ERR;
goto exit;
}
@ -3367,7 +3367,7 @@ int __cil_resolve_ast_last_child_helper(struct cil_tree_node *current, void *ext
if (((struct cil_optional *)parent->data)->datum.state == CIL_STATE_DISABLING) {
/* go into the optional, removing everything that it added */
if (args->pass > CIL_PASS_CALL1) {
if (args->pass >= CIL_PASS_CALL1) {
rc = cil_tree_walk(parent, __cil_disable_children_helper, NULL, NULL, extra_args);
if (rc != SEPOL_OK) {
cil_log(CIL_ERR, "Failed to disable declarations in optional\n");