No longer apologize to users

This commit is contained in:
bubulle 2007-10-27 12:46:30 +00:00
parent d254707b96
commit d059ef6780
4 changed files with 9 additions and 4 deletions

View File

@ -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> 2007-10-13 Nicolas François <nicolas.francois@centraliens.net>
* NEWS, po/zh_CN.po: Updated Chinese translation. Imported from * NEWS, po/zh_CN.po: Updated Chinese translation. Imported from

View File

@ -397,7 +397,7 @@ int main (int argc, char **argv)
* there is no password, print out "Sorry" and give up * there is no password, print out "Sorry" and give up
*/ */
sleep (1); sleep (1);
fputs (_("Sorry.\n"), stderr); fputs (_("No password.\n"), stderr);
goto failure; goto failure;
} }
@ -406,7 +406,6 @@ int main (int argc, char **argv)
"Invalid password for group `%s' from `%s'", "Invalid password for group `%s' from `%s'",
group, name)); group, name));
sleep (1); sleep (1);
fputs (_("Sorry.\n"), stderr);
goto failure; goto failure;
} }
} }

View File

@ -350,7 +350,7 @@ static void check_password (const struct passwd *pw, const struct spwd *sp)
if (now < ok) { if (now < ok) {
fprintf (stderr, fprintf (stderr,
_ _
("Sorry, the password for %s cannot be changed yet.\n"), ("The password for %s cannot be changed yet.\n"),
pw->pw_name); pw->pw_name);
SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name)); SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name));
closelog (); closelog ();

View File

@ -140,7 +140,6 @@ static void su_failure (const char *tty)
oldname[0] ? oldname : "???", name[0] ? name : "???")); oldname[0] ? oldname : "???", name[0] ? name : "???"));
closelog (); closelog ();
#endif #endif
puts (_("Sorry."));
exit (1); exit (1);
} }