Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/loginutils/su.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/loginutils/su.c (modified) (5 diffs)

branches/3.2/mindi-busybox/loginutils/su.c

@@ -8 +8 @@
 #include "libbb.h"
 #include <syslog.h>
+
+//usage:#define su_trivial_usage
+//usage:       "[OPTIONS] [-] [USER]"
+//usage:#define su_full_usage "\n\n"
+//usage:       "Run shell under USER (by default, root)\n"
+//usage:     "\n    -,-l    Clear environment, run shell as login shell"
+//usage:     "\n    -p,-m   Do not set new $HOME, $SHELL, $USER, $LOGNAME"
+//usage:     "\n    -c CMD  Command to pass to 'sh -c'"
+//usage:     "\n    -s SH   Shell to use instead of user's default"
 
 #if ENABLE_FEATURE_SU_CHECKS_SHELLS
@@ -43 +52 @@
     uid_t cur_uid = getuid();
     const char *tty;
+#if ENABLE_FEATURE_UTMP
     char user_buf[64];
+#endif
     const char *old_user;
 
@@ -103 +114 @@
     }
 
-    /* Make sure pw->pw_shell is non-NULL.  It may be NULL when NEW_USER
-     * is a username that is retrieved via NIS (YP), that doesn't have
-     * a default shell listed.  */
-    if (!pw->pw_shell || !pw->pw_shell[0])
-        pw->pw_shell = (char *)DEFAULT_SHELL;
-
 #if ENABLE_FEATURE_SU_CHECKS_SHELLS
-    if (opt_shell && cur_uid != 0 && restricted_shell(pw->pw_shell)) {
+    if (opt_shell && cur_uid != 0 && pw->pw_shell && restricted_shell(pw->pw_shell)) {
         /* The user being su'd to has a nonstandard shell, and so is
          * probably a uucp account or has restricted access.  Don't
@@ -116 +121 @@
          * shell.  */
         bb_error_msg("using restricted shell");
-        opt_shell = NULL;
+        opt_shell = NULL; /* ignore -s PROG */
     }
     /* else: user can run whatever he wants via "su -s PROG USER".
@@ -127 +132 @@
     setup_environment(opt_shell,
             ((flags & SU_OPT_l) / SU_OPT_l * SETUP_ENV_CLEARENV)
-            + (!(flags & SU_OPT_mp) * SETUP_ENV_CHANGEENV),
+            + (!(flags & SU_OPT_mp) * SETUP_ENV_CHANGEENV)
+            + (!(flags & SU_OPT_l) * SETUP_ENV_NO_CHDIR),
             pw);
     IF_SELINUX(set_current_security_context(NULL);)