diff options
| author | Karel Zak | 2006-12-07 00:26:22 +0100 |
|---|---|---|
| committer | Karel Zak | 2006-12-07 00:26:22 +0100 |
| commit | 0b0bb92085fc7a7e7d2afe984e43161a2f4ec140 (patch) | |
| tree | e560f6b005f0e83713e8259f2f12806dd8d39ec6 /login-utils | |
| parent | Imported from util-linux-2.12h tarball. (diff) | |
| download | kernel-qcow2-util-linux-0b0bb92085fc7a7e7d2afe984e43161a2f4ec140.tar.gz kernel-qcow2-util-linux-0b0bb92085fc7a7e7d2afe984e43161a2f4ec140.tar.xz kernel-qcow2-util-linux-0b0bb92085fc7a7e7d2afe984e43161a2f4ec140.zip | |
Imported from util-linux-2.12i tarball.
Diffstat (limited to 'login-utils')
| -rw-r--r-- | login-utils/Makefile | 9 | ||||
| -rw-r--r-- | login-utils/chfn.c | 4 | ||||
| -rw-r--r-- | login-utils/chsh.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/login-utils/Makefile b/login-utils/Makefile index baefa434c..6b05a1683 100644 --- a/login-utils/Makefile +++ b/login-utils/Makefile @@ -55,14 +55,13 @@ SELINUXOBJS=selinux_utils.o endif ifeq "$(HAVE_SHADOW)" "no" +WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-putils +WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-putils ifeq "$(HAVE_PAM)" "no" ifeq "$(HAVE_PASSWD)" "no" -WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-passwd all-putils -WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-passwd install-putils +WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-passwd +WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-passwd endif -else -WHAT_TO_BUILD:=$(WHAT_TO_BUILD) all-putils -WHAT_TO_INSTALL:=$(WHAT_TO_INSTALL) install-putils endif endif diff --git a/login-utils/chfn.c b/login-utils/chfn.c index 643a16319..834dedfd4 100644 --- a/login-utils/chfn.c +++ b/login-utils/chfn.c @@ -184,9 +184,9 @@ int main (int argc, char **argv) { exit(1); } retcode = pam_acct_mgmt(pamh, 0); - if (retcode == PAM_NEW_AUTHTOK_REQD) { + if (retcode == PAM_NEW_AUTHTOK_REQD) retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); - } else if (retcode) { + if (retcode) { puts(_("Password error.")); exit(1); } diff --git a/login-utils/chsh.c b/login-utils/chsh.c index 03c0ec483..aa8e10dcd 100644 --- a/login-utils/chsh.c +++ b/login-utils/chsh.c @@ -181,9 +181,9 @@ main (int argc, char *argv[]) { exit(1); } retcode = pam_acct_mgmt(pamh, 0); - if (retcode == PAM_NEW_AUTHTOK_REQD) { + if (retcode == PAM_NEW_AUTHTOK_REQD) retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); - } else if (retcode) { + if (retcode) { puts(_("Password error.")); exit(1); } |