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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-16 23:29:41 +0000 (Fri, 16 Nov 2007)
New Revision: 1354

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/usermod.c
Log:
Update the group database before flushing the nscd caches.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-16 23:26:56 UTC (rev 1353)
+++ upstream/trunk/ChangeLog	2007-11-16 23:29:41 UTC (rev 1354)
@@ -1,5 +1,10 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, src/usermod.c: Update the group database before flushing
+	the nscd caches.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/userdel.c: Abort if an error is found while updating the
 	user or group database. No changes will be written in the
 	databases.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-11-16 23:26:56 UTC (rev 1353)
+++ upstream/trunk/NEWS	2007-11-16 23:29:41 UTC (rev 1354)
@@ -27,6 +27,7 @@
   (https://bugzilla.redhat.com/show_bug.cgi?id=240915)
 - userdel: Abort if an error is detected while updating the passwd or group
   databases. The passwd or group files will not be written.
+- usermod: Update the group database before flushing the nscd caches.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2					28-10-2007
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2007-11-16 23:26:56 UTC (rev 1353)
+++ upstream/trunk/src/usermod.c	2007-11-16 23:29:41 UTC (rev 1354)
@@ -1529,12 +1529,12 @@
 	usr_update ();
 	close_files ();
 
+	if (Gflg || lflg)
+		grp_err = grp_update ();
+
 	nscd_flush_cache ("passwd");
 	nscd_flush_cache ("group");
 
-	if (Gflg || lflg)
-		grp_err = grp_update ();
-
 	if (mflg)
 		move_home ();