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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-10-27 12:46:30 +0000 (Sat, 27 Oct 2007)
New Revision: 1293

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/newgrp.c
   upstream/trunk/src/passwd.c
   upstream/trunk/src/su.c
Log:
No longer apologize to users


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-10-27 12:42:21 UTC (rev 1292)
+++ upstream/trunk/ChangeLog	2007-10-27 12:46:30 UTC (rev 1293)
@@ -1,3 +1,10 @@
+2007-10-27  Christian Perrier  <bubulle at debian.org
+
+	* src/newgrp.c,	src/passwd.c, src/su.c:
+	No longer 'apologize' to users when they use incorrect passwords
+	Remove "Sorry" from programs display
+	Imported from Debian's patch 413_no-sorry-in-passwd
+
 2007-10-13  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* NEWS, po/zh_CN.po: Updated Chinese translation. Imported from

Modified: upstream/trunk/src/newgrp.c
===================================================================
--- upstream/trunk/src/newgrp.c	2007-10-27 12:42:21 UTC (rev 1292)
+++ upstream/trunk/src/newgrp.c	2007-10-27 12:46:30 UTC (rev 1293)
@@ -397,7 +397,7 @@
 			 * there is no password, print out "Sorry" and give up
 			 */
 			sleep (1);
-			fputs (_("Sorry.\n"), stderr);
+			fputs (_("No password.\n"), stderr);
 			goto failure;
 		}
 
@@ -406,7 +406,6 @@
 				 "Invalid password for group `%s' from `%s'",
 				 group, name));
 			sleep (1);
-			fputs (_("Sorry.\n"), stderr);
 			goto failure;
 		}
 	}

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2007-10-27 12:42:21 UTC (rev 1292)
+++ upstream/trunk/src/passwd.c	2007-10-27 12:46:30 UTC (rev 1293)
@@ -350,7 +350,7 @@
 	if (now < ok) {
 		fprintf (stderr,
 			 _
-			 ("Sorry, the password for %s cannot be changed yet.\n"),
+			 ("The password for %s cannot be changed yet.\n"),
 			 pw->pw_name);
 		SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name));
 		closelog ();

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2007-10-27 12:42:21 UTC (rev 1292)
+++ upstream/trunk/src/su.c	2007-10-27 12:46:30 UTC (rev 1293)
@@ -140,7 +140,6 @@
 			 oldname[0] ? oldname : "???", name[0] ? name : "???"));
 	closelog ();
 #endif
-	puts (_("Sorry."));
 	exit (1);
 }