[Pkg-shadow-commits] r3116 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-16 19:14:37 +0000 (Tue, 16 Mar 2010)
New Revision: 3116

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* 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.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-16 19:13:53 UTC (rev 3115)
+++ upstream/trunk/ChangeLog	2010-03-16 19:14:37 UTC (rev 3116)
@@ -1,5 +1,11 @@
 2010-03-15  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* src/userdel.c: Avoid perror. Give more verbose warnings.
 
 2010-03-11  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2010-03-16 19:13:53 UTC (rev 3115)
+++ upstream/trunk/src/usermod.c	2010-03-16 19:14:37 UTC (rev 3116)
@@ -1793,7 +1793,7 @@
 	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);
 	}