From 7eaa03709b337b586b11c4b9b53c9675f4de690c Mon Sep 17 00:00:00 2001 From: Sergey Naumov Date: Mon, 30 Jan 2012 12:52:56 +0100 Subject: login: -f should not ask for password even with PAM Signed-off-by: Sergey Naumov Signed-off-by: Denys Vlasenko --- loginutils/login.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'loginutils/login.c') diff --git a/loginutils/login.c b/loginutils/login.c index 73db8fa63..bf43f3aba 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -342,14 +342,16 @@ int login_main(int argc UNUSED_PARAM, char **argv) goto pam_auth_failed; } } - pamret = pam_authenticate(pamh, 0); - if (pamret != PAM_SUCCESS) { - failed_msg = "authenticate"; - goto pam_auth_failed; - /* TODO: or just "goto auth_failed" - * since user seems to enter wrong password - * (in this case pamret == 7) - */ + if (!(opt & LOGIN_OPT_f)) { + pamret = pam_authenticate(pamh, 0); + if (pamret != PAM_SUCCESS) { + failed_msg = "authenticate"; + goto pam_auth_failed; + /* TODO: or just "goto auth_failed" + * since user seems to enter wrong password + * (in this case pamret == 7) + */ + } } /* check that the account is healthy */ pamret = pam_acct_mgmt(pamh, 0); -- cgit v1.2.3