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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-05-18 19:32:32 +0000 (Fri, 18 May 2012)
New Revision: 3726

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpunconv.c
   upstream/trunk/src/pwunconv.c
Log:
	* 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).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2012-05-18 19:27:30 UTC (rev 3725)
+++ upstream/trunk/ChangeLog	2012-05-18 19:32:32 UTC (rev 3726)
@@ -1,5 +1,12 @@
 2012-05-18  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* NEWS, src/userdel.c: Fix segfault when userdel removes the
 	user's group.
 

Modified: upstream/trunk/src/grpunconv.c
===================================================================
--- upstream/trunk/src/grpunconv.c	2012-05-18 19:27:30 UTC (rev 3725)
+++ upstream/trunk/src/grpunconv.c	2012-05-18 19:32:32 UTC (rev 3726)
@@ -205,13 +205,7 @@
 		}
 	}
 
-	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,

Modified: upstream/trunk/src/pwunconv.c
===================================================================
--- upstream/trunk/src/pwunconv.c	2012-05-18 19:27:30 UTC (rev 3725)
+++ upstream/trunk/src/pwunconv.c	2012-05-18 19:32:32 UTC (rev 3726)
@@ -221,13 +221,7 @@
 		}
 	}
 
-	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,