[git commit] Selinux complains about deprecated selinux/flask.h, stop including it

Denys Vlasenko vda.linux at googlemail.com
Fri Dec 23 12:52:13 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=4ea0ebdd429fe761c1324176b1ac6017248366af
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 loginutils/login.c | 4 +++-
 selinux/runcon.c   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/loginutils/login.c b/loginutils/login.c
index 52abc18..3ca8213 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -69,7 +69,9 @@
 #if ENABLE_SELINUX
 # include <selinux/selinux.h>  /* for is_selinux_enabled()  */
 # include <selinux/get_context_list.h> /* for get_default_context() */
-# include <selinux/flask.h> /* for security class definitions  */
+# /* from deprecated <selinux/flask.h>: */
+# undef  SECCLASS_CHR_FILE
+# define SECCLASS_CHR_FILE 10
 #endif
 
 #if ENABLE_PAM
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 366834e..16f1711 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -68,7 +68,9 @@
 //usage:	)
 
 #include <selinux/context.h>
-#include <selinux/flask.h>
+/* from deprecated <selinux/flask.h>: */
+#undef  SECCLASS_PROCESS
+#define SECCLASS_PROCESS 2
 
 #include "libbb.h"
 


More information about the busybox-cvs mailing list