libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / loginutils / su.c

diff --git a/loginutils/su.c b/loginutils/su.c
index 72dd0f06f0b6a59ed1fd2885177aac8c25af4deb..c51f26f70f0a65fc1dde85a5ecffb8203ac50272 100644 (file)
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -12,7 +12,6 @@
 //usage:       "[OPTIONS] [-] [USER]"
 //usage:#define su_full_usage "\n\n"
 //usage:       "Run shell under USER (by default, root)\n"
-//usage:     "\nOptions:"
 //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'"
@@ -94,7 +93,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
 
        pw = xgetpwnam(opt_username);
 
-       if (cur_uid == 0 || correct_password(pw)) {
+       if (cur_uid == 0 || ask_and_check_password(pw) > 0) {
                if (ENABLE_FEATURE_SU_SYSLOG)
                        syslog(LOG_NOTICE, "%c %s %s:%s",
                                '+', tty, old_user, opt_username);
@@ -132,7 +131,8 @@ int su_main(int argc UNUSED_PARAM, char **argv)
        change_identity(pw);
        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);)