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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-09 13:14:31 +0000 (Sat, 09 May 2009)
New Revision: 2863

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: Exit immediately when unlocking a password would
	result in a passwordless account. This avoid printing a success
	message after the warning.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-05-09 13:14:23 UTC (rev 2862)
+++ upstream/trunk/ChangeLog	2009-05-09 13:14:31 UTC (rev 2863)
@@ -1,5 +1,11 @@
 2009-05-07  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: Exit immediately when unlocking a password would
+	result in a passwordless account. This avoid printing a success
+	message after the warning.
+
+2009-05-07  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/nologin.c: Include <stdlib.h> to get EXIT_FAILURE.
 
 2009-05-04  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2009-05-09 13:14:23 UTC (rev 2862)
+++ upstream/trunk/src/passwd.c	2009-05-09 13:14:31 UTC (rev 2863)
@@ -519,9 +519,10 @@
 	if (uflg && *cp == '!') {
 		if (cp[1] == '\0') {
 			fprintf (stderr,
-				 _("%s: unlocking the password would result in a passwordless account.\n"
-				   "You should set a password with usermod -p to unlock the password of this account.\n"),
-				 Prog);
+			         _("%s: unlocking the password would result in a passwordless account.\n"
+			           "You should set a password with usermod -p to unlock the password of this account.\n"),
+			         Prog);
+			fail_exit (E_FAILURE);
 		} else {
 			cp++;
 		}