From 265095a2fef6ceba2f0eb958cd5159c77d415a4a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 15 Apr 2008 13:56:28 +0200 Subject: [PATCH] chfn, chsh, login: collapsing three similar messages into a single one Signed-off-by: Benno Schulenberg --- login-utils/chfn.c | 4 ++-- login-utils/chsh.c | 4 ++-- login-utils/login.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/login-utils/chfn.c b/login-utils/chfn.c index a08713b2..ee0dc312 100644 --- a/login-utils/chfn.c +++ b/login-utils/chfn.c @@ -186,8 +186,8 @@ int main (int argc, char **argv) { retcode = pam_start("chfn", oldf.username, &conv, &pamh); if(retcode != PAM_SUCCESS) { - fprintf(stderr, _("chfn: PAM Failure, aborting: %s\n"), - pam_strerror(pamh, retcode)); + fprintf(stderr, _("%s: PAM failure, aborting: %s\n"), + whoami, pam_strerror(pamh, retcode)); exit(1); } diff --git a/login-utils/chsh.c b/login-utils/chsh.c index 58cbbb06..d4cc5267 100644 --- a/login-utils/chsh.c +++ b/login-utils/chsh.c @@ -185,8 +185,8 @@ main (int argc, char *argv[]) { retcode = pam_start("chsh", pw->pw_name, &conv, &pamh); if(retcode != PAM_SUCCESS) { - fprintf(stderr, _("chsh: PAM Failure, aborting: %s\n"), - pam_strerror(pamh, retcode)); + fprintf(stderr, _("%s: PAM failure, aborting: %s\n"), + whoami, pam_strerror(pamh, retcode)); exit(1); } diff --git a/login-utils/login.c b/login-utils/login.c index 0e6db2b5..aad27794 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -548,8 +548,8 @@ main(int argc, char **argv) retcode = pam_start("login",username, &conv, &pamh); if(retcode != PAM_SUCCESS) { - fprintf(stderr, _("login: PAM Failure, aborting: %s\n"), - pam_strerror(pamh, retcode)); + fprintf(stderr, _("%s: PAM failure, aborting: %s\n"), + "login", pam_strerror(pamh, retcode)); syslog(LOG_ERR, _("Couldn't initialize PAM: %s"), pam_strerror(pamh, retcode)); exit(99); -- 2.39.5