diff mbox series

libsepol: add missing word separators in error message

Message ID 20241204140614.25879-1-cgoettsche@seltendoof.de (mailing list archive)
State Accepted
Commit b234b7103705
Delegated to: Petr Lautrbach
Headers show
Series libsepol: add missing word separators in error message | expand

Commit Message

Christian Göttsche Dec. 4, 2024, 2:06 p.m. UTC 
From: Christian Göttsche <cgzones@googlemail.com>

The concatenation of the multi line error messages misses a separating
space between the boundary words.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 libsepol/src/write.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

James Carter Dec. 4, 2024, 8:05 p.m. UTC | #1 
On Wed, Dec 4, 2024 at 9:06 AM Christian Göttsche
<cgoettsche@seltendoof.de> wrote:
>
> From: Christian Göttsche <cgzones@googlemail.com>
>
> The concatenation of the multi line error messages misses a separating
> space between the boundary words.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  libsepol/src/write.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libsepol/src/write.c b/libsepol/src/write.c
> index 4ef98449..89c80e7e 100644
> --- a/libsepol/src/write.c
> +++ b/libsepol/src/write.c
> @@ -231,13 +231,13 @@ static int avtab_write_item(policydb_t * p,
>                 return POLICYDB_ERROR;
>         if ((p->policyvers < POLICYDB_VERSION_XPERMS_IOCTL) &&
>                         (cur->key.specified & AVTAB_XPERMS)) {
> -               ERR(fp->handle, "policy version %u does not support extended"
> +               ERR(fp->handle, "policy version %u does not support extended "
>                                 "permissions rules and one was specified", p->policyvers);
>                 return POLICYDB_ERROR;
>         }
>
>         if (!policydb_has_cond_xperms_feature(p) && (cur->key.specified & AVTAB_XPERMS) && conditional) {
> -               ERR(fp->handle, "policy version %u does not support extended"
> +               ERR(fp->handle, "policy version %u does not support extended "
>                                 "permissions rules in conditional policies and one was specified", p->policyvers);
>                 return POLICYDB_ERROR;
>         }
> --
> 2.45.2
>
>
James Carter Dec. 17, 2024, 8:25 p.m. UTC | #2 
On Wed, Dec 4, 2024 at 3:05 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Wed, Dec 4, 2024 at 9:06 AM Christian Göttsche
> <cgoettsche@seltendoof.de> wrote:
> >
> > From: Christian Göttsche <cgzones@googlemail.com>
> >
> > The concatenation of the multi line error messages misses a separating
> > space between the boundary words.
> >
> > Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>
Merged.
Thanks,
Jim

> > ---
> >  libsepol/src/write.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libsepol/src/write.c b/libsepol/src/write.c
> > index 4ef98449..89c80e7e 100644
> > --- a/libsepol/src/write.c
> > +++ b/libsepol/src/write.c
> > @@ -231,13 +231,13 @@ static int avtab_write_item(policydb_t * p,
> >                 return POLICYDB_ERROR;
> >         if ((p->policyvers < POLICYDB_VERSION_XPERMS_IOCTL) &&
> >                         (cur->key.specified & AVTAB_XPERMS)) {
> > -               ERR(fp->handle, "policy version %u does not support extended"
> > +               ERR(fp->handle, "policy version %u does not support extended "
> >                                 "permissions rules and one was specified", p->policyvers);
> >                 return POLICYDB_ERROR;
> >         }
> >
> >         if (!policydb_has_cond_xperms_feature(p) && (cur->key.specified & AVTAB_XPERMS) && conditional) {
> > -               ERR(fp->handle, "policy version %u does not support extended"
> > +               ERR(fp->handle, "policy version %u does not support extended "
> >                                 "permissions rules in conditional policies and one was specified", p->policyvers);
> >                 return POLICYDB_ERROR;
> >         }
> > --
> > 2.45.2
> >
> >
diff mbox series

Patch

diff --git a/libsepol/src/write.c b/libsepol/src/write.c
index 4ef98449..89c80e7e 100644
--- a/libsepol/src/write.c
+++ b/libsepol/src/write.c
@@ -231,13 +231,13 @@  static int avtab_write_item(policydb_t * p,
 		return POLICYDB_ERROR;
 	if ((p->policyvers < POLICYDB_VERSION_XPERMS_IOCTL) &&
 			(cur->key.specified & AVTAB_XPERMS)) {
-		ERR(fp->handle, "policy version %u does not support extended"
+		ERR(fp->handle, "policy version %u does not support extended "
 				"permissions rules and one was specified", p->policyvers);
 		return POLICYDB_ERROR;
 	}
 
 	if (!policydb_has_cond_xperms_feature(p) && (cur->key.specified & AVTAB_XPERMS) && conditional) {
-		ERR(fp->handle, "policy version %u does not support extended"
+		ERR(fp->handle, "policy version %u does not support extended "
 				"permissions rules in conditional policies and one was specified", p->policyvers);
 		return POLICYDB_ERROR;
 	}