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 a08713b29f6efda0620ee5466e0fde74db670611..ee0dc312c3fb39950d0e8a4d1cc866ed909af090 100644 (file)
--- 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 58cbbb068adade8f29c9366c6e8e20219f7e3407..d4cc5267000314a1473ecde3460004ef9a665a01 100644 (file)
--- 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 0e6db2b5ad886d966a8a6abcbc549b6b5c9782ea..aad27794327c60391b5148b367d2c79338fc6ee4 100644 (file)
--- 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);