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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-15 21:32:26 +0000 (Sun, 15 Mar 2009)
New Revision: 2527

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/gpasswd.c
Log:
	* src/gpasswd.c: log_gpasswd_success_gshadow is in the cleanup
	stack only when the shadow group file is present.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-03-15 21:29:16 UTC (rev 2526)
+++ upstream/trunk/ChangeLog	2009-03-15 21:32:26 UTC (rev 2527)
@@ -1,5 +1,10 @@
 2009-03-15  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/gpasswd.c: log_gpasswd_success_gshadow is in the cleanup
+	stack only when the shadow group file is present.
+
+2009-03-15  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/userdel.c: Make sure the user exists in the shadow
 	database before calling spw_remove().
 	* NEWS, src/userdel.c: When the user's group is removed, make sure

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2009-03-15 21:29:16 UTC (rev 2526)
+++ upstream/trunk/src/gpasswd.c	2009-03-15 21:32:26 UTC (rev 2527)
@@ -696,7 +696,9 @@
 	log_gpasswd_success_system (NULL);
 	del_cleanup (log_gpasswd_success_group);
 #ifdef SHADOWGRP
-	del_cleanup (log_gpasswd_success_gshadow);
+	if (is_shadowgrp) {
+		del_cleanup (log_gpasswd_success_gshadow);
+	}
 #endif
 }