diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2016-04-06 14:27:07 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2016-04-06 14:27:07 +0200 |
| commit | 7e09188c5dc4d0372ac7016f682cf63c686afe4a (patch) | |
| tree | 8a926f06f3e527f5a1daffe4289f4c00178172fc /modules/pam_unix/pam_unix_auth.c | |
| parent | 3c4328635ade0cd7bc1fb9d5f145f4dff76f9c1b (diff) | |
| download | pam-7e09188c5dc4d0372ac7016f682cf63c686afe4a.tar.gz pam-7e09188c5dc4d0372ac7016f682cf63c686afe4a.tar.bz2 pam-7e09188c5dc4d0372ac7016f682cf63c686afe4a.zip | |
pam_unix: Use pam_get_authtok() instead of direct pam_prompt() calls.
We have to drop support for not_set_pass option which is not much useful
anyway. Instead we get proper support for authtok_type option.
* modules/pam_unix/pam_unix.8.xml: Removed not_set_pass option, added authtok_ty
pe
option.
* modules/pam_unix/pam_unix_auth.c (pam_sm_authenticate): Replace _unix_read_pas
sword()
call with equivalent pam_get_authtok() call.
* modules/pam_unix/pam_unix_passwd.c (pam_sm_chauthtok): Likewise and also drop
support for not_set_pass.
* modules/pam_unix/support.c (_unix_read_password): Remove.
* modules/pam_unix/support.h: Remove UNIX_NOT_SET_PASS add UNIX_AUTHTOK_TYPE.
Diffstat (limited to 'modules/pam_unix/pam_unix_auth.c')
| -rw-r--r-- | modules/pam_unix/pam_unix_auth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c index 9f66c5d6..673861e4 100644 --- a/modules/pam_unix/pam_unix_auth.c +++ b/modules/pam_unix/pam_unix_auth.c @@ -103,7 +103,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) unsigned int ctrl; int retval, *ret_data = NULL; const char *name; - const void *p; + const char *p; D(("called.")); @@ -151,8 +151,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } /* get this user's authentication token */ - retval = _unix_read_password(pamh, ctrl, NULL, _("Password: "), NULL - ,_UNIX_AUTHTOK, &p); + retval = pam_get_authtok(pamh, PAM_AUTHTOK, &p , NULL); if (retval != PAM_SUCCESS) { if (retval != PAM_CONV_AGAIN) { pam_syslog(pamh, LOG_CRIT, |