Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/runit/chpst.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/runit/chpst.c (modified) (5 diffs)

branches/3.3/mindi-busybox/runit/chpst.c

@@ -27 +27 @@
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
-/* Dependencies on runit_lib.c removed */
+
+//config:config CHPST
+//config:   bool "chpst"
+//config:   default y
+//config:   help
+//config:     chpst changes the process state according to the given options, and
+//config:     execs specified program.
+//config:
+//config:config SETUIDGID
+//config:   bool "setuidgid"
+//config:   default y
+//config:   help
+//config:     Sets soft resource limits as specified by options
+//config:
+//config:config ENVUIDGID
+//config:   bool "envuidgid"
+//config:   default y
+//config:   help
+//config:     Sets $UID to account's uid and $GID to account's gid
+//config:
+//config:config ENVDIR
+//config:   bool "envdir"
+//config:   default y
+//config:   help
+//config:     Sets various environment variables as specified by files
+//config:     in the given directory
+//config:
+//config:config SOFTLIMIT
+//config:   bool "softlimit"
+//config:   default y
+//config:   help
+//config:     Sets soft resource limits as specified by options
+
+//applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
+//applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
+//applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
+//applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
+
+//kbuild:lib-$(CONFIG_CHPST) += chpst.o
+//kbuild:lib-$(CONFIG_ENVDIR) += chpst.o
+//kbuild:lib-$(CONFIG_ENVUIDGID) += chpst.o
+//kbuild:lib-$(CONFIG_SETUIDGID) += chpst.o
+//kbuild:lib-$(CONFIG_SOFTLIMIT) += chpst.o
 
 //usage:#define chpst_trivial_usage
@@ -213 +256 @@
     }
     closedir(dir);
-    if (fchdir(wdir) == -1)
-        bb_perror_msg_and_die("fchdir");
+    xfchdir(wdir);
     close(wdir);
 }
@@ -237 +279 @@
     struct bb_uidgid_t ugid;
     char *set_user = set_user; /* for compiler */
-    char *env_user = env_user;
     char *env_dir = env_dir;
     char *root;
@@ -265 +306 @@
             &limita, &limitc, &limitd, &limitf, &limitl,
             &limitm, &limito, &limitp, &limitr, &limits, &limitt,
-            &set_user, &env_user, &env_dir
+            &set_user, &set_user, &env_dir
             IF_CHPST(, &root, &nicestr));
         argv += optind;
@@ -293 +334 @@
     // envuidgid?
     if (ENABLE_ENVUIDGID && applet_name[0] == 'e' && applet_name[3] == 'u') {
-        env_user = *argv++;
+        set_user = *argv++;
         opt |= OPT_U;
     }