* src/pwunconv.c: Do not check spw_close() return value (file is

	opened readonly).
	* src/grpunconv.c: Do not check sgr_close() return value (file is
	opened readonly).

diff --git a/ChangeLog b/ChangeLog
index c610a284e4899561ee679f67f44a8c4a807a6518..730796b8deeb0838005d4fdd54b865cf13dc2c72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-18  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/pwunconv.c: Do not check spw_close() return value (file is
+       opened readonly).
+       * src/grpunconv.c: Do not check sgr_close() return value (file is
+       opened readonly).
+
 2012-05-18  Nicolas François  <nicolas.francois@centraliens.net>
 
        * NEWS, src/userdel.c: Fix segfault when userdel removes the

diff --git a/src/grpunconv.c b/src/grpunconv.c
index 79c7d9565c0a1495c057af6d2aa88f4f9ba05ff6..ea8914cb3bd2576aec6b2a1a828a3f3eb1b754c6 100644 (file)
--- a/src/grpunconv.c
+++ b/src/grpunconv.c
@@ -205,13 +205,7 @@ int main (int argc, char **argv)
                }
        }
 
-       if (sgr_close () == 0) {
-               fprintf (stderr,
-                        _("%s: failure while writing changes to %s\n"),
-                        Prog, sgr_dbname ());
-               SYSLOG ((LOG_ERR, "failure while writing changes to %s", sgr_dbname ()));
-               fail_exit (3);
-       }
+       (void) sgr_close (); /* was only open O_RDONLY */
 
        if (gr_close () == 0) {
                fprintf (stderr,

diff --git a/src/pwunconv.c b/src/pwunconv.c
index c136ed40a0579650b0278aced3651fededb1f562..4c3c6e5baa4376d94d115beae0fac7c8a23f433b 100644 (file)
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -221,13 +221,7 @@ int main (int argc, char **argv)
                }
        }
 
-       if (spw_close () == 0) {
-               fprintf (stderr,
-                        _("%s: failure while writing changes to %s\n"),
-                        Prog, spw_dbname ());
-               SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
-               fail_exit (3);
-       }
+       (void) spw_close (); /* was only open O_RDONLY */
 
        if (pw_close () == 0) {
                fprintf (stderr,