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

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

@@ -5 +5 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config SU
+//config:   bool "su"
+//config:   default y
+//config:   select FEATURE_SYSLOG
+//config:   help
+//config:     su is used to become another user during a login session.
+//config:     Invoked without a username, su defaults to becoming the super user.
+//config:
+//config:     Note that Busybox binary must be setuid root for this applet to
+//config:     work properly.
+//config:
+//config:config FEATURE_SU_SYSLOG
+//config:   bool "Enable su to write to syslog"
+//config:   default y
+//config:   depends on SU
+//config:
+//config:config FEATURE_SU_CHECKS_SHELLS
+//config:   bool "Enable su to check user's shell to be listed in /etc/shells"
+//config:   depends on SU
+//config:   default y
 
-#include "libbb.h"
-#include <syslog.h>
+//applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
+//applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
+
+//kbuild:lib-$(CONFIG_SU) += su.o
 
 //usage:#define su_trivial_usage
@@ -17 +39 @@
 //usage:     "\n    -c CMD  Command to pass to 'sh -c'"
 //usage:     "\n    -s SH   Shell to use instead of user's default"
+
+#include "libbb.h"
+#include <syslog.h>
 
 #if ENABLE_FEATURE_SU_CHECKS_SHELLS
@@ -94 +119 @@
     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",
@@ -102 +127 @@
             syslog(LOG_NOTICE, "%c %s %s:%s",
                 '-', tty, old_user, opt_username);
+        bb_do_delay(LOGIN_FAIL_DELAY);
         bb_error_msg_and_die("incorrect password");
     }