* src/gpasswd.c: log_gpasswd_success_gshadow is in the cleanup

	stack only when the shadow group file is present.

diff --git a/ChangeLog b/ChangeLog
index 21b4c976baf0cdf4040ccb39a3c6bda7dfec9633..8a5139c0a778a6916a322d482947f82866180561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-15  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * NEWS, src/userdel.c: Make sure the user exists in the shadow

diff --git a/src/gpasswd.c b/src/gpasswd.c
index d71275aea334c5788c2180bbd002ae85201d85a5..18fbb47c0a9ee9e44610936359a56ef2523f25bc 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -696,7 +696,9 @@ static void close_files (void)
        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
 }