Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/selinux/runcon.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/selinux/runcon.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/selinux/runcon.c

@@ -26 +26 @@
  * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp>
  *                  - based on coreutils-5.97 (in Fedora Core 6)
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include <getopt.h>
@@ -40 +42 @@
 
     if (getcon(&cur_context))
-        bb_error_msg_and_die("cannot get current context");
+        bb_error_msg_and_die("can't get current context");
 
     if (compute_trans) {
@@ -46 +48 @@
 
         if (getfilecon(command, &file_context) < 0)
-            bb_error_msg_and_die("cannot retrieve attributes of '%s'",
+            bb_error_msg_and_die("can't retrieve attributes of '%s'",
                          command);
         if (security_compute_create(cur_context, file_context,
@@ -58 +60 @@
         bb_error_msg_and_die("'%s' is not a valid context", cur_context);
     if (user && context_user_set(con, user))
-        bb_error_msg_and_die("failed to set new user '%s'", user);
+        bb_error_msg_and_die("can't set new user '%s'", user);
     if (type && context_type_set(con, type))
-        bb_error_msg_and_die("failed to set new type '%s'", type);
+        bb_error_msg_and_die("can't set new type '%s'", type);
     if (range && context_range_set(con, range))
-        bb_error_msg_and_die("failed to set new range '%s'", range);
+        bb_error_msg_and_die("can't set new range '%s'", range);
     if (role && context_role_set(con, role))
-        bb_error_msg_and_die("failed to set new role '%s'", role);
+        bb_error_msg_and_die("can't set new role '%s'", role);
 
     return con;
@@ -88 +90 @@
 #define OPTS_CONTEXT_COMPONENT      (OPTS_ROLE | OPTS_TYPE | OPTS_USER | OPTS_RANGE)
 
-int runcon_main(int argc, char **argv);
-int runcon_main(int argc, char **argv)
+int runcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int runcon_main(int argc UNUSED_PARAM, char **argv)
 {
     char *role = NULL;
@@ -128 +130 @@
 
     if (setexeccon(context_str(con)))
-        bb_error_msg_and_die("cannot set up security context '%s'",
+        bb_error_msg_and_die("can't set up security context '%s'",
                      context_str(con));
 
     execvp(argv[0], argv);
-
-    bb_perror_msg_and_die("cannot execute '%s'", argv[0]);
+    bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }