| Message ID | 20170410191149.17419-3-nicolas.iooss@m4x.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, 2017-04-10 at 21:11 +0200, Nicolas Iooss wrote: > Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org> Thanks, all three applied. > --- > libsepol/src/module_to_cil.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/libsepol/src/module_to_cil.c > b/libsepol/src/module_to_cil.c > index 45acdeb1a4e0..ac095c30f4f3 100644 > --- a/libsepol/src/module_to_cil.c > +++ b/libsepol/src/module_to_cil.c > @@ -791,8 +791,8 @@ static int cil_print_attr_strs(int indent, struct > policydb *pdb, int is_type, vo > // CIL doesn't support anonymous > positive/negative/complemented sets. So > // instead we create a CIL type/roleattributeset that > matches the set. If > // the set has a negative set, then convert it to is (P & > !N), where P is > - // the list of members in the positive set , and N is the > list of members > - // in the negative set. Additonally, if the set is > complemented, then wrap > + // the list of members in the positive set and N is the list > of members > + // in the negative set. Additionally, if the set is > complemented, then wrap > // the whole thing with a negation. > > struct ebitmap_node *node; > @@ -2103,13 +2103,13 @@ static int role_to_cil(int indent, struct > policydb *pdb, struct avrule_block *UN > // the policy type, it would result in > duplicate declarations, > // which isn't allowed in CIL. Patches have > been made to refpolicy > // to remove these duplicate role > declarations, but we need to be > - // backwards compatable and support older > policies. Since we know > + // backwards compatible and support older > policies. Since we know > // these roles are always declared in base, > only print them when we > // see them in the base module. If the > declarations appear in a > // non-base module, ignore their > declarations. > // > // Note that this is a hack, and if a policy > author does not define > - // one of these roles in base, the > declaration will not appeaer in > + // one of these roles in base, the > declaration will not appear in > // the resulting policy, likely resulting in > a compilation error in > // CIL. > // > @@ -2289,7 +2289,7 @@ static int user_to_cil(int indent, struct > policydb *pdb, struct avrule_block *bl > > if (block->flags & AVRULE_OPTIONAL) { > // sensitivites in user statements in optionals do > not have the > - // standard -1 offest > + // standard -1 offset > sens_offset = 0; > } >
diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c index 45acdeb1a4e0..ac095c30f4f3 100644 --- a/libsepol/src/module_to_cil.c +++ b/libsepol/src/module_to_cil.c @@ -791,8 +791,8 @@ static int cil_print_attr_strs(int indent, struct policydb *pdb, int is_type, vo // CIL doesn't support anonymous positive/negative/complemented sets. So // instead we create a CIL type/roleattributeset that matches the set. If // the set has a negative set, then convert it to is (P & !N), where P is - // the list of members in the positive set , and N is the list of members - // in the negative set. Additonally, if the set is complemented, then wrap + // the list of members in the positive set and N is the list of members + // in the negative set. Additionally, if the set is complemented, then wrap // the whole thing with a negation. struct ebitmap_node *node; @@ -2103,13 +2103,13 @@ static int role_to_cil(int indent, struct policydb *pdb, struct avrule_block *UN // the policy type, it would result in duplicate declarations, // which isn't allowed in CIL. Patches have been made to refpolicy // to remove these duplicate role declarations, but we need to be - // backwards compatable and support older policies. Since we know + // backwards compatible and support older policies. Since we know // these roles are always declared in base, only print them when we // see them in the base module. If the declarations appear in a // non-base module, ignore their declarations. // // Note that this is a hack, and if a policy author does not define - // one of these roles in base, the declaration will not appeaer in + // one of these roles in base, the declaration will not appear in // the resulting policy, likely resulting in a compilation error in // CIL. // @@ -2289,7 +2289,7 @@ static int user_to_cil(int indent, struct policydb *pdb, struct avrule_block *bl if (block->flags & AVRULE_OPTIONAL) { // sensitivites in user statements in optionals do not have the - // standard -1 offest + // standard -1 offset sens_offset = 0; }
Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org> --- libsepol/src/module_to_cil.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)