No longer apologize to users

diff --git a/ChangeLog b/ChangeLog
index a6617b724e37993dfed0dadab85ae01c289540fb..cb1aea976f1868eec8f0804385db598d5f7cb79d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-27  Christian Perrier  <bubulle@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@centraliens.net>
 
        * NEWS, po/zh_CN.po: Updated Chinese translation. Imported from

diff --git a/src/newgrp.c b/src/newgrp.c
index c8ba4f4fb3db4835c3fc8c08d73a6fa07f11c445..1f53744182d9ef5de3aa632d420a20d8524147a5 100644 (file)
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -397,7 +397,7 @@ int main (int argc, char **argv)
                         * 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 @@ int main (int argc, char **argv)
                                 "Invalid password for group `%s' from `%s'",
                                 group, name));
                        sleep (1);
-                       fputs (_("Sorry.\n"), stderr);
                        goto failure;
                }
        }

diff --git a/src/passwd.c b/src/passwd.c
index 6c4cf05fcbc5bc78956067746f11ad73aac12f2d..c1ea95120be3a75d52fc9fb20007a28016bda1ab 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -350,7 +350,7 @@ static void check_password (const struct passwd *pw, const struct spwd *sp)
        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 ();

diff --git a/src/su.c b/src/su.c
index 745f476622e6ecdd54e775920ecbd6225ee590b7..230a68c999d00cef639c2dc175c3dfc8048856d9 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -140,7 +140,6 @@ static void su_failure (const char *tty)
                         oldname[0] ? oldname : "???", name[0] ? name : "???"));
        closelog ();
 #endif
-       puts (_("Sorry."));
        exit (1);
 }