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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-28 20:46:35 +0000 (Tue, 28 Apr 2009)
New Revision: 2839

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: Harmonize status report at the end of passwd.
	Prefix the messages with "passwd: ", only indicate a password
	change if the password was actually changed, and password
	properties changed otherwise.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-28 20:10:18 UTC (rev 2838)
+++ upstream/trunk/ChangeLog	2009-04-28 20:46:35 UTC (rev 2839)
@@ -1,5 +1,12 @@
 2009-04-28  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: Harmonize status report at the end of passwd.
+	Prefix the messages with "passwd: ", only indicate a password
+	change if the password was actually changed, and password
+	properties changed otherwise.
+
+2009-04-28  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/chgpasswd.c, src/newusers.c: There is no need to test for 0
 	after getopt_long. No options have flag != NULL.
 

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2009-04-28 20:10:18 UTC (rev 2838)
+++ upstream/trunk/src/passwd.c	2009-04-28 20:46:35 UTC (rev 2839)
@@ -1104,10 +1104,12 @@
 	SYSLOG ((LOG_INFO, "password for '%s' changed by '%s'", name, myname));
 	closelog ();
 	if (!qflg) {
-		if (!eflg) {
-			puts (_("Password changed."));
+		if (!anyflag) {
+#ifndef USE_PAM
+			printf (_("%s: password changed."), Prog);
+#endif				/* USE_PAM */
 		} else {
-			puts (_("Password set to expire."));
+			printf (_("%s: password properties changed."), Prog);
 		}
 	}
 	exit (E_SUCCESS);