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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 13:29:16 +0000 (Thu, 14 Jul 2011)
New Revision: 3386

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* src/usermod.c (process_flags): Check for oflg is not needed to
	check if changes are needed.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-14 13:29:10 UTC (rev 3385)
+++ upstream/trunk/ChangeLog	2011-07-14 13:29:16 UTC (rev 3386)
@@ -9,6 +9,8 @@
 	* src/usermod.c (process_flags): Check option compatibility and
 	dependency before options are discarded when no changes are
 	requested.
+	* src/usermod.c (process_flags): Check for oflg is not needed to
+	check if changes are needed.
 
 2011-07-08  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2011-07-14 13:29:10 UTC (rev 3385)
+++ upstream/trunk/src/usermod.c	2011-07-14 13:29:16 UTC (rev 3386)
@@ -1116,7 +1116,7 @@
 		cflg = false;
 	}
 
-	if (!(Uflg || uflg || sflg || pflg || oflg || mflg || Lflg ||
+	if (!(Uflg || uflg || sflg || pflg || mflg || Lflg ||
 	      lflg || Gflg || gflg || fflg || eflg || dflg || cflg
 #ifdef WITH_SELINUX
 	      || Zflg