* src/usermod.c: user_newname and user_newid cannot be used to

	test if the username or ID is changed. lflg and uflg should be
	used instead.

diff --git a/ChangeLog b/ChangeLog
index 18ffa42fe9fff92b299bc3226b723a1b52f6feb0..ea74360bcf5c9dae1cba776e51cc49b7cad03e34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/usermod.c: user_newname and user_newid cannot be used to
+       test if the username or ID is changed. lflg and uflg should be
+       used instead.
+
 2010-03-15  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/userdel.c: Avoid perror. Give more verbose warnings.

diff --git a/src/usermod.c b/src/usermod.c
index 826b8d5da5e162ee6726cf9afa6f19c40ff88a1c..ad98bb2f38ce21411d32a279f4cd12dfc2ea7521 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1793,7 +1793,7 @@ int main (int argc, char **argv)
        close_files ();
 
 #ifdef WITH_TCB
-       if (   ((NULL != user_newname) || (user_newid != -1))
+       if (   (lflg || uflg)
            && (!shadowtcb_move (user_newname, user_newid)) ) {
                exit (E_PW_UPDATE);
        }