d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't ask root for the old password, except in the NIS case.

Browse Source 
Sponsored by:	DARPA, NAI Labs
This commit is contained in:
des 2002-04-26 19:28:17 +00:00
parent d4ef4eff54
commit a6e173ee33
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libpam/modules/pam_unix/pam_unix.c
View File

@ -313,6 +313,11 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
PAM_LOG("PRELIM round");
if (getuid() == 0 &&
(pwd->pw_fields & _PWF_SOURCE) == _PWF_FILES)
/* root doesn't need the old password */
return (pam_set_item(pamh, PAM_OLDAUTHTOK, ""));
if (pwd->pw_passwd[0] == '\0'
&& pam_test_option(&options, PAM_OPT_NULLOK, NULL)) {
/*
@ -338,7 +343,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
PAM_LOG("UPDATE round");
retval = pam_get_authtok(pamh,
PAM_AUTHTOK, &old_pass, NULL);
PAM_OLDAUTHTOK, &old_pass, NULL);
if (retval != PAM_SUCCESS)
return (retval);
PAM_LOG("Got old password");