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

[Benno Schulenberg <bensberg@xxxxxxxxxxxxx>]

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 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 a08713b..ee0dc31 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 58cbbb0..d4cc526 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 0e6db2b..aad2779 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);
-- 
1.5.3.8

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html