5da4fbf19c
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- policycoreutils python gui sandbox dbus semodule-utils restorecond
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From e45bc870946ad3c984595a679df86b424f24d09d Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Iooss <nicolas.iooss@m4x.org>
|
|
Date: Sat, 3 Jul 2021 16:31:21 +0200
|
|
Subject: [PATCH] policycoreutils: silence -Wextra-semi-stmt warning
|
|
|
|
On Ubuntu 20.04, when building with clang -Werror -Wextra-semi-stmt
|
|
(which is not the default build configuration), the compiler reports:
|
|
|
|
secon.c:686:3: error: empty expression statement has no effect;
|
|
remove unnecessary ';' to silence this warning
|
|
[-Werror,-Wextra-semi-stmt]
|
|
};
|
|
^
|
|
|
|
Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
|
|
---
|
|
policycoreutils/newrole/newrole.c | 2 +-
|
|
policycoreutils/secon/secon.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c
|
|
index 36e2ba9c25d9..0264531acef4 100644
|
|
--- a/policycoreutils/newrole/newrole.c
|
|
+++ b/policycoreutils/newrole/newrole.c
|
|
@@ -96,7 +96,7 @@
|
|
#define USAGE_STRING "USAGE: newrole [ -r role ] [ -t type ] [ -l level ] [ -p ] [ -V ] [ -- args ]"
|
|
|
|
#ifdef USE_PAM
|
|
-#define PAM_SERVICE_CONFIG "/etc/selinux/newrole_pam.conf";
|
|
+#define PAM_SERVICE_CONFIG "/etc/selinux/newrole_pam.conf"
|
|
#endif
|
|
|
|
#define DEFAULT_PATH "/usr/bin:/bin"
|
|
diff --git a/policycoreutils/secon/secon.c b/policycoreutils/secon/secon.c
|
|
index d257a9a1ca6c..a0957d0914e1 100644
|
|
--- a/policycoreutils/secon/secon.c
|
|
+++ b/policycoreutils/secon/secon.c
|
|
@@ -683,7 +683,7 @@ static void disp_con(const char *scon_raw)
|
|
color.range_bg = strtok(NULL, " ");
|
|
|
|
color.valid = 1;
|
|
- };
|
|
+ }
|
|
|
|
if (!(con = context_new(scon)))
|
|
errx(EXIT_FAILURE, "Couldn't create context from: %s", scon);
|
|
--
|
|
2.32.0
|
|
|