From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 15 Apr 2008 11:56:28 +0000 (+0200)
Subject: chfn, chsh, login: collapsing three similar messages into a single one
X-Git-Tag: v2.14-rc1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=265095a2fef6ceba2f0eb958cd5159c77d415a4a;p=thirdparty%2Futil-linux.git

chfn, chsh, login: collapsing three similar messages into a single one

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index a08713b29f..ee0dc312c3 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 58cbbb068a..d4cc526700 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 0e6db2b5ad..aad2779432 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);