On Wed, Jun 12, 2024 at 2:10 PM James Carter <jwcart2@xxxxxxxxx> wrote:
>
> On Sat, Jun 8, 2024 at 1:23 PM Christian Göttsche
> <cgoettsche@xxxxxxxxxxxxx> wrote:
> >
> > From: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
> >
> > Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
>
> Acked-by: James Carter <jwcart2@xxxxxxxxx>
>
Merged.
Thanks,
Jim
> > ---
> > libselinux/utils/sefcontext_compile.c | 2 +-
> > libsepol/src/kernel_to_cil.c | 4 ++--
> > libsepol/src/kernel_to_conf.c | 4 ++--
> > secilc/docs/cil_reference_guide.md | 4 ++--
> > 4 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/libselinux/utils/sefcontext_compile.c b/libselinux/utils/sefcontext_compile.c
> > index 6c32172d..8677189e 100644
> > --- a/libselinux/utils/sefcontext_compile.c
> > +++ b/libselinux/utils/sefcontext_compile.c
> > @@ -189,7 +189,7 @@ static int write_binary_file(struct saved_data *data, int fd,
> > if (len != 1)
> > goto err;
> >
> > - /* original context strin (including nul) */
> > + /* original context string (including nul) */
> > len = fwrite(context, sizeof(char), to_write, bin_file);
> > if (len != to_write)
> > goto err;
> > diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
> > index e20ba4af..f94cb245 100644
> > --- a/libsepol/src/kernel_to_cil.c
> > +++ b/libsepol/src/kernel_to_cil.c
> > @@ -303,7 +303,7 @@ static int class_constraint_rules_to_strs(struct policydb *pdb, char *classkey,
> > goto exit;
> > }
> > if (*perms == '\0') {
> > - ERR(NULL, "No permisisons in permission string");
> > + ERR(NULL, "No permissions in permission string");
> > free(perms);
> > rc = -1;
> > goto exit;
> > @@ -1782,7 +1782,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_dat
> > goto exit;
> > }
> > if (*perms == '\0') {
> > - ERR(NULL, "No permisisons in permission string");
> > + ERR(NULL, "No permissions in permission string");
> > free(perms);
> > goto exit;
> > }
> > diff --git a/libsepol/src/kernel_to_conf.c b/libsepol/src/kernel_to_conf.c
> > index 5860a513..ca91ffae 100644
> > --- a/libsepol/src/kernel_to_conf.c
> > +++ b/libsepol/src/kernel_to_conf.c
> > @@ -298,7 +298,7 @@ static int class_constraint_rules_to_strs(struct policydb *pdb, char *classkey,
> > goto exit;
> > }
> > if (*perms == '\0') {
> > - ERR(NULL, "No permisisons in permission string");
> > + ERR(NULL, "No permissions in permission string");
> > free(perms);
> > rc = -1;
> > goto exit;
> > @@ -1748,7 +1748,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_dat
> > goto exit;
> > }
> > if (*permstring == '\0') {
> > - ERR(NULL, "No permisisons in permission string");
> > + ERR(NULL, "No permissions in permission string");
> > free(permstring);
> > goto exit;
> > }
> > diff --git a/secilc/docs/cil_reference_guide.md b/secilc/docs/cil_reference_guide.md
> > index d1d3ff16..5ae5a3a3 100644
> > --- a/secilc/docs/cil_reference_guide.md
> > +++ b/secilc/docs/cil_reference_guide.md
> > @@ -281,7 +281,7 @@ The number of `expr_set`'s in an `expr` is dependent on the statement type (ther
> > (mlsconstrain (process (transition dyntransition))
> > (or (and (eq h1 h2) (eq l1 l2)) (eq t1 mlstrustedsubject)))
> >
> > - ; The equivalent policy language mlsconstrain statememt is:
> > + ; The equivalent policy language mlsconstrain statement is:
> > ;mlsconstrain process { transition dyntransition }
> > ; ((h1 eq h2 and l1 eq l2) or t1 == mlstrustedsubject);
> >
> > @@ -289,7 +289,7 @@ The number of `expr_set`'s in an `expr` is dependent on the statement type (ther
> > (mlsconstrain (process (getsched getsession getpgid getcap getattr ptrace share))
> > (or (dom l1 l2) (eq t1 mlstrustedsubject)))
> >
> > - ; The equivalent policy language mlsconstrain statememt is:
> > + ; The equivalent policy language mlsconstrain statement is:
> > ;mlsconstrain process { getsched getsession getpgid getcap getattr ptrace share }
> > ; (l1 dom l2 or t1 == mlstrustedsubject);
> > ```
> > --
> > 2.45.1
> >
> >
