summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenno Schulenberg2008-04-15 13:56:28 +0200
committerKarel Zak2008-04-16 00:29:30 +0200
commit265095a2fef6ceba2f0eb958cd5159c77d415a4a (patch)
treedaaad694d29e15a0bafb2f0b4144338c677e1b8b
parentlosetup: split help message into two smaller parts (diff)
downloadkernel-qcow2-util-linux-265095a2fef6ceba2f0eb958cd5159c77d415a4a.tar.gz
kernel-qcow2-util-linux-265095a2fef6ceba2f0eb958cd5159c77d415a4a.tar.xz
kernel-qcow2-util-linux-265095a2fef6ceba2f0eb958cd5159c77d415a4a.zip
chfn, chsh, login: collapsing three similar messages into a single one
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
-rw-r--r--login-utils/chfn.c4
-rw-r--r--login-utils/chsh.c4
-rw-r--r--login-utils/login.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index a08713b29..ee0dc312c 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 58cbbb068..d4cc52670 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 0e6db2b5a..aad277943 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);