Merge branch 'busybox' into merge

8 files changed, 22 insertions, 38 deletions

diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 4e70b2557..a032abbed 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -24,21 +24,13 @@
 //kbuild:lib-$(CONFIG_CHPASSWD) += chpasswd.o
 
 //usage:#define chpasswd_trivial_usage
-//usage:        IF_LONG_OPTS("[--md5|--encrypted|--crypt-method|--root]") IF_NOT_LONG_OPTS("[-m|-e|-c|-R]")
+//usage:        "[-me] [-c ALG] [-R DIR]"
 //usage:#define chpasswd_full_usage "\n\n"
 //usage:       "Read user:password from stdin and update /etc/passwd\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -e,--encrypted          Supplied passwords are in encrypted form"
-//usage:     "\n        -m,--md5                Encrypt using md5, not des"
-//usage:     "\n        -c,--crypt-method ALG   "CRYPT_METHODS_HELP_STR
-//usage:     "\n        -R,--root DIR           Directory to chroot into"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -e      Supplied passwords are in encrypted form"
 //usage:     "\n        -m      Encrypt using md5, not des"
 //usage:     "\n        -c ALG  "CRYPT_METHODS_HELP_STR
 //usage:     "\n        -R DIR  Directory to chroot into"
-//usage:        )
 
 #include "libbb.h"
 
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index fbb7f0515..645f1bb09 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -32,22 +32,14 @@
 //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o
 
 //usage:#define cryptpw_trivial_usage
-//usage:       "[OPTIONS] [PASSWORD] [SALT]"
+//usage:       "[-s] [-p N] [-m TYPE] [-S SALT] [PASSWORD] [SALT]"
 /* We do support -s, we just don't mention it */
 //usage:#define cryptpw_full_usage "\n\n"
 //usage:       "Print crypt(3) hashed PASSWORD\n"
-//usage:        IF_LONG_OPTS(
-//usage:     "\n        -P,--password-fd N      Read password from fd N"
-/* //usage:  "\n        -s,--stdin              Use stdin; like -P0" */
-//usage:     "\n        -m,--method TYPE        "CRYPT_METHODS_HELP_STR
-//usage:     "\n        -S,--salt SALT"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -P N    Read password from fd N"
 /* //usage:  "\n        -s      Use stdin; like -P0" */
 //usage:     "\n        -m TYPE "CRYPT_METHODS_HELP_STR
 //usage:     "\n        -S SALT"
-//usage:        )
 
 #include "libbb.h"
 
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 7393a3d1c..6c6d409f4 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -404,7 +404,7 @@ static void finalize_tty_attrs(void)
         set_tty_attrs();
 
         /* Now the newline character should be properly written */
-        full_write(STDOUT_FILENO, "\n", 1);
+        full_write1_str("\n");
 }
 
 /* extract baud rate from modem status message */
@@ -434,7 +434,7 @@ static void auto_baud(void)
          * Wait for a while, then read everything the modem has said so far and
          * try to extract the speed of the dial-in call.
          */
-        sleep(1);
+        sleep1();
         nread = safe_read(STDIN_FILENO, G.line_buf, sizeof(G.line_buf) - 1);
         if (nread > 0) {
                 int speed;
@@ -498,13 +498,13 @@ static char *get_logname(void)
                         case 0x7f:
                                 G.tty_attrs.c_cc[VERASE] = c;
                                 if (bp > G.line_buf) {
-                                        full_write(STDOUT_FILENO, "\010 \010", 3);
+                                        full_write1_str("\010 \010");
                                         bp--;
                                 }
                                 break;
                         case CTL('U'):
                                 while (bp > G.line_buf) {
-                                        full_write(STDOUT_FILENO, "\010 \010", 3);
+                                        full_write1_str("\010 \010");
                                         bp--;
                                 }
                                 break;
diff --git a/loginutils/login.c b/loginutils/login.c
index 4e65b3a19..21c32fc25 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -341,6 +341,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_LOGIN_SESSION_AS_CHILD
         pid_t child_pid;
 #endif
+        IF_FEATURE_UTMP(pid_t my_pid;)
 
         INIT_G();
 
@@ -504,16 +505,14 @@ int login_main(int argc UNUSED_PARAM, char **argv)
 #endif /* ENABLE_PAM */
  auth_failed:
                 opt &= ~LOGIN_OPT_f;
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 /* TODO: doesn't sound like correct English phrase to me */
                 puts("Login incorrect");
+                syslog(LOG_WARNING, "invalid password for '%s'%s",
+                                        username, fromhost);
                 if (++count == 3) {
-                        syslog(LOG_WARNING, "invalid password for '%s'%s",
-                                                username, fromhost);
-
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 free(fromhost);
-
                         return EXIT_FAILURE;
                 }
                 username[0] = '\0';
@@ -525,6 +524,9 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         if (pw->pw_uid != 0)
                 die_if_nologin();
 
+        IF_FEATURE_UTMP(my_pid = getpid();)
+        update_utmp(my_pid, USER_PROCESS, short_tty, username, run_by_root ? opt_host : NULL);
+
 #if ENABLE_LOGIN_SESSION_AS_CHILD
         child_pid = vfork();
         if (child_pid != 0) {
@@ -532,8 +534,8 @@ int login_main(int argc UNUSED_PARAM, char **argv)
                         bb_simple_perror_msg("vfork");
                 else {
                         wait_for_exitstatus(child_pid);
-                        update_utmp_DEAD_PROCESS(child_pid);
                 }
+                update_utmp_DEAD_PROCESS(my_pid);
                 login_pam_end(pamh);
                 return 0;
         }
@@ -546,8 +548,6 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         fchown(0, pw->pw_uid, pw->pw_gid);
         fchmod(0, 0600);
 
-        update_utmp(getpid(), USER_PROCESS, short_tty, username, run_by_root ? opt_host : NULL);
-
         /* We trust environment only if we run by root */
         if (ENABLE_LOGIN_SCRIPTS && run_by_root)
                 run_login_script(pw, full_tty);
@@ -602,7 +602,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         signal(SIGINT, SIG_DFL);
 
         /* Exec login shell with no additional parameters */
-        run_shell(pw->pw_shell, 1, NULL);
+        exec_login_shell(pw->pw_shell);
 
         /* return EXIT_FAILURE; - not reached */
 }
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 6c643d3d0..acc942275 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -28,7 +28,7 @@
 //kbuild:lib-$(CONFIG_PASSWD) += passwd.o
 
 //usage:#define passwd_trivial_usage
-//usage:       "[OPTIONS] [USER]"
+//usage:       "[-a ALG] [-dlu] [USER]"
 //usage:#define passwd_full_usage "\n\n"
 //usage:       "Change USER's password (default: current user)"
 //usage:     "\n"
@@ -57,7 +57,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
                 encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
                 if (strcmp(encrypted, pw->pw_passwd) != 0) {
                         syslog(LOG_WARNING, "incorrect password for %s", pw->pw_name);
-                        bb_do_delay(LOGIN_FAIL_DELAY);
+                        pause_after_failed_login();
                         puts("Incorrect password");
                         goto err_ret;
                 }
diff --git a/loginutils/su.c b/loginutils/su.c
index 79edbc44a..e46bbf78b 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -147,7 +147,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
                 if (ENABLE_FEATURE_SU_SYSLOG)
                         syslog(LOG_NOTICE, "%c %s %s:%s",
                                 '-', tty, old_user, opt_username);
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 bb_simple_error_msg_and_die("incorrect password");
         }
 
@@ -205,7 +205,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
          */
 
         /* Never returns */
-        run_shell(opt_shell, flags & SU_OPT_l, (const char**)argv);
+        exec_shell(opt_shell, flags & SU_OPT_l, (const char**)argv);
 
         /* return EXIT_FAILURE; - not reached */
 }
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 099085340..69d8b5ec7 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -74,7 +74,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 if (r > 0) {
                         break;
                 }
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 bb_simple_info_msg("Login incorrect");
         }
 
@@ -89,5 +89,5 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 shell = pwd->pw_shell;
 
         /* Exec login shell with no additional parameters. Never returns. */
-        run_shell(shell, 1, NULL);
+        exec_login_shell(shell);
 }
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 9e319fe61..334b7d2ad 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -120,7 +120,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
                 if (ask_and_check_password(pw) > 0) {
                         break;
                 }
-                bb_do_delay(LOGIN_FAIL_DELAY);
+                pause_after_failed_login();
                 puts("Incorrect password");
         }