Merge branch 'busybox' into mergemerge

Signed-off-by: Ron Yorston <rmy@pobox.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index c0928a5a8..e764deb60 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -124,10 +124,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
 
 #if ENABLE_SELINUX
         if ((flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) && is_selinux_enabled() > 0) {
-                security_context_t con;
+                char *con;
                 if (lgetfilecon(source, &con) >= 0) {
                         if (setfscreatecon(con) < 0) {
-                                bb_perror_msg("can't set setfscreatecon %s", con);
+                                bb_perror_msg("can't setfscreatecon %s", con);
                                 freecon(con);
                                 return -1;
                         }
@@ -333,7 +333,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 if ((flags & (FILEUTILS_PRESERVE_SECURITY_CONTEXT|FILEUTILS_SET_SECURITY_CONTEXT))
                  && is_selinux_enabled() > 0
                 ) {
-                        security_context_t con;
+                        char *con;
                         if (getfscreatecon(&con) == -1) {
                                 bb_simple_perror_msg("getfscreatecon");
                                 return -1;
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index c22bba87b..1c366d069 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -33,14 +33,14 @@
 #endif
 
 #if ENABLE_SELINUX
-static security_context_t current_sid;
+static char *current_sid;
 
 void FAST_FUNC renew_current_security_context(void)
 {
         freecon(current_sid);  /* Release old context  */
         getcon(&current_sid);  /* update */
 }
-void FAST_FUNC set_current_security_context(security_context_t sid)
+void FAST_FUNC set_current_security_context(char *sid)
 {
         freecon(current_sid);  /* Release old context  */
         current_sid = sid;
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index f917a1c6a..8f00f2db5 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -9,7 +9,7 @@
 #include "libbb.h"
 #include <selinux/context.h>
 
-context_t FAST_FUNC set_security_context_component(security_context_t cur_context,
+context_t FAST_FUNC set_security_context_component(char *cur_context,
                         char *user, char *role, char *type, char *range)
 {
         context_t con = context_new(cur_context);
@@ -31,7 +31,7 @@ error:
         return NULL;
 }
 
-void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
+void FAST_FUNC setfscreatecon_or_die(char *scontext)
 {
         if (setfscreatecon(scontext) < 0) {
                 /* Can be NULL. All known printf implementations
@@ -43,7 +43,7 @@ void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
 
 void FAST_FUNC selinux_preserve_fcontext(int fdesc)
 {
-        security_context_t context;
+        char *context;
 
         if (fgetfilecon(fdesc, &context) < 0) {
                 if (errno == ENODATA || errno == ENOTSUP)
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index a228075cc..b8a47dc5a 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -18,7 +18,7 @@
 #if ENABLE_SELINUX
 static void check_selinux_update_passwd(const char *username)
 {
-        security_context_t seuser;
+        char *seuser;
         char *p;
 
         if (getuid() != (uid_t)0 || is_selinux_enabled() == 0)