Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/selinux/setfiles.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/selinux/setfiles.c (modified) (5 diffs)

branches/3.2/mindi-busybox/selinux/setfiles.c

@@ -4 +4 @@
   Port to BusyBox (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
 */
+
+//usage:#define setfiles_trivial_usage
+//usage:       "[-dnpqsvW] [-e DIR]... [-o FILE] [-r alt_root_path]"
+//usage:    IF_FEATURE_SETFILES_CHECK_OPTION(
+//usage:       " [-c policyfile] spec_file"
+//usage:    )
+//usage:       " pathname"
+//usage:#define setfiles_full_usage "\n\n"
+//usage:       "Reset file contexts under pathname according to spec_file\n"
+//usage:    IF_FEATURE_SETFILES_CHECK_OPTION(
+//usage:     "\n    -c FILE Check the validity of the contexts against the specified binary policy"
+//usage:    )
+//usage:     "\n    -d  Show which specification matched each file"
+//usage:     "\n    -l  Log changes in file labels to syslog"
+//usage:     "\n    -n  Don't change any file labels"
+//usage:     "\n    -q  Suppress warnings"
+//usage:     "\n    -r DIR  Use an alternate root path"
+//usage:     "\n    -e DIR  Exclude DIR"
+//usage:     "\n    -F  Force reset of context to match file_context for customizable files"
+//usage:     "\n    -o FILE Save list of files with incorrect context"
+//usage:     "\n    -s  Take a list of files from stdin (instead of command line)"
+//usage:     "\n    -v  Show changes in file labels, if type or role are changing"
+//usage:     "\n    -vv Show changes in file labels, if type, role, or user are changing"
+//usage:     "\n    -W  Display warnings about entries that had no matching files"
+//usage:
+//usage:#define restorecon_trivial_usage
+//usage:       "[-iFnRv] [-e EXCLUDEDIR]... [-o FILE] [-f FILE]"
+//usage:#define restorecon_full_usage "\n\n"
+//usage:       "Reset security contexts of files in pathname\n"
+//usage:     "\n    -i  Ignore files that don't exist"
+//usage:     "\n    -f FILE File with list of files to process"
+//usage:     "\n    -e DIR  Directory to exclude"
+//usage:     "\n    -R,-r   Recurse"
+//usage:     "\n    -n  Don't change any file labels"
+//usage:     "\n    -o FILE Save list of files with incorrect context"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -vv Show changed labels"
+//usage:     "\n    -F  Force reset of context to match file_context"
+//usage:     "\n        for customizable files, or the user section,"
+//usage:     "\n        if it has changed"
 
 #include "libbb.h"
@@ -459 +499 @@
     if (S_ISDIR(sb.st_mode) && recurse) {
         if (recursive_action(name,
-                     ACTION_RECURSE,
-                     apply_spec,
-                     apply_spec,
-                     NULL, 0) != TRUE) {
+                ACTION_RECURSE,
+                apply_spec,
+                apply_spec,
+                NULL, 0) != TRUE
+        ) {
             bb_error_msg("error while labeling %s", name);
             goto err;
@@ -545 +586 @@
                 IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
             &exclude_dir, &input_filename, &rootpath, &out_filename,
-                 IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
+                IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
             &verbose);
     }
@@ -561 +602 @@
 
         /* Only process the specified file_contexts file, not
-           any .homedirs or .local files, and do not perform
-           context translations. */
+         * any .homedirs or .local files, and do not perform
+         * context translations. */
         set_matchpathcon_flags(MATCHPATHCON_BASEONLY |
                        MATCHPATHCON_NOTRANS |
@@ -592 +633 @@
     if (applet_name[0] == 's') { /* setfiles */
         /* Use our own invalid context checking function so that
-           we can support either checking against the active policy or
-           checking against a binary policy file. */
+         * we can support either checking against the active policy or
+         * checking against a binary policy file. */
         set_matchpathcon_canoncon(&canoncon);
         if (!argv[0])