Merge branch 'busybox' into merge

4 files changed, 6 insertions, 6 deletions

diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 4b3602e7a..dd0532c66 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -114,7 +114,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
                 if (rc < 0)
                         bb_error_msg_and_die("an error occurred updating password for %s", name);
                 if (rc)
-                        bb_error_msg("password for '%s' changed", name);
+                        bb_info_msg("password for '%s' changed", name);
                 logmode = LOGMODE_STDIO;
                 free(name);
                 free(free_me);
diff --git a/loginutils/login.c b/loginutils/login.c
index 4df651cc6..a08642a34 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -534,7 +534,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
                         wait_for_exitstatus(child_pid);
                         update_utmp_DEAD_PROCESS(child_pid);
                 }
-                IF_PAM(login_pam_end(pamh);)
+                login_pam_end(pamh);
                 return 0;
         }
 #endif
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 30e096460..6c643d3d0 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -228,7 +228,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
         /* LOGMODE_BOTH */
         if (rc < 0)
                 bb_error_msg_and_die("can't update password file %s", filename);
-        bb_error_msg("password for %s changed by %s", name, myname);
+        bb_info_msg("password for %s changed by %s", name, myname);
 
         /*if (ENABLE_FEATURE_CLEAN_UP) free(newp); - can't, it may be non-malloced */
  skip:
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 27ea5dff0..9bb4d3613 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -68,17 +68,17 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
                 );
                 if (r < 0) {
                         /* ^D, ^C, timeout, or read error */
-                        bb_error_msg("normal startup");
+                        bb_info_msg("normal startup");
                         return 0;
                 }
                 if (r > 0) {
                         break;
                 }
                 bb_do_delay(LOGIN_FAIL_DELAY);
-                bb_error_msg("Login incorrect");
+                bb_info_msg("Login incorrect");
         }
 
-        bb_error_msg("starting shell for system maintenance");
+        bb_info_msg("starting shell for system maintenance");
 
         IF_SELINUX(renew_current_security_context());