user_newname can only be used in WITH_AUDIT code or when lflg is set. This

issue was introduced in the code refactoring of usermod.

diff --git a/ChangeLog b/ChangeLog
index d9b1f0a22ecfc9c776fc1dc726bb4181c735c993..01f2146d98ab792996466320370d4e467ef82fdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/usermod.c: user_newname can only be used in WITH_AUDIT code
+       or when lflg is set. This issue was introduced in the code
+       refactoring of usermod.
+
 2008-01-22  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/groupadd.c: Fix typo in comment: s/find_new_uid/find_new_gid/

diff --git a/src/usermod.c b/src/usermod.c
index 47fcacccfa709f3ff54121efef6cd094561e3190..bc3a57c0ae3693e0bea773f08cec137f33500525 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -319,7 +319,8 @@ static char *new_pw_passwd (char *pw_pass)
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "updating passwd",
                              user_newname, user_newid, 0);
 #endif
-               SYSLOG ((LOG_INFO, "lock user `%s' password", user_newname));
+               SYSLOG ((LOG_INFO, "lock user `%s' password",
+                        lflg ? user_newname : user_name));
                strcpy (buf, "!");
                strcat (buf, pw_pass);
                pw_pass = buf;
@@ -338,7 +339,8 @@ static char *new_pw_passwd (char *pw_pass)
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "updating password",
                              user_newname, user_newid, 0);
 #endif
-               SYSLOG ((LOG_INFO, "unlock user `%s' password", user_newname));
+               SYSLOG ((LOG_INFO, "unlock user `%s' password",
+                        lflg ? user_newname : user_name));
                s = pw_pass;
                while (*s) {
                        *s = *(s + 1);
@@ -349,7 +351,8 @@ static char *new_pw_passwd (char *pw_pass)
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "changing password",
                              user_newname, user_newid, 1);
 #endif
-               SYSLOG ((LOG_INFO, "change user `%s' password", user_newname));
+               SYSLOG ((LOG_INFO, "change user `%s' password",
+                        lflg ? user_newname : user_name));
                pw_pass = xstrdup (user_pass);
        }
        return pw_pass;