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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-09-18 20:26:27 +0000 (Sun, 18 Sep 2011)
New Revision: 3488

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpconv.c
Log:
	* src/grpconv.c: Fail if not called correctly.
	* src/grpconv.c: At the end of main, the passwd and shadow files
	are locked. No need to check before unlocking. No need to set the
	lock as false neither since there cannot be anymore failures.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-09-18 20:24:36 UTC (rev 3487)
+++ upstream/trunk/ChangeLog	2011-09-18 20:26:27 UTC (rev 3488)
@@ -1,5 +1,12 @@
 2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/grpconv.c: Fail if not called correctly.
+	* src/grpconv.c: At the end of main, the passwd and shadow files
+	are locked. No need to check before unlocking. No need to set the
+	lock as false neither since there cannot be anymore failures.
+
+2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/chage.c: EPOCH is not needed, it's converted to -1 by
 	strtoday(). But we need to support "-1" specifically.
 	* src/chage.c: Fix usage: LOGIN is mandatory.

Modified: upstream/trunk/src/grpconv.c
===================================================================
--- upstream/trunk/src/grpconv.c	2011-09-18 20:24:36 UTC (rev 3487)
+++ upstream/trunk/src/grpconv.c	2011-09-18 20:26:27 UTC (rev 3488)
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 1996 - 2000, Marek Michałkiewicz
  * Copyright (c) 2002 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2011       , Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,6 +92,7 @@
 
 	if (1 != argc) {
 		(void) fputs (_("Usage: grpconv\n"), stderr);
+		fail_exit (2);
 	}
 	Prog = Basename (argv[0]);
 
@@ -209,13 +211,11 @@
 		SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ()));
 		/* continue */
 	}
-	sgr_locked = false;
 	if (gr_unlock () == 0) {
 		fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ());
 		SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ()));
 		/* continue */
 	}
-	gr_locked = false;
 
 	nscd_flush_cache ("group");