mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

Make pwcheck local to the pwflag block.

Browse Source 
Use pwcheck even if user didn't match since Defaults options may still apply.
This commit is contained in:
Todd C. Miller
2007-07-06 19:51:03 +00:00
parent 6f1a9c0bc9
commit a26c783bea
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
parse.c
View File

@@ -99,20 +99,12 @@ sudoers_lookup(pwflag)
int pwflag; int pwflag;
{ {
int validated, matched, host_matched, runas_matched, cmnd_matched; int validated, matched, host_matched, runas_matched, cmnd_matched;
enum def_tupple pwcheck = 0;
struct cmndspec *cs; struct cmndspec *cs;
struct cmndtag *tags = NULL; struct cmndtag *tags = NULL;
struct member *runas; struct member *runas;
struct privilege *priv; struct privilege *priv;
struct userspec *us; struct userspec *us;
/*
* We use pwflag to tell us when a password should be required
* for pseudo-commands. XXX - pass in pwcheck, not pwflag
*/
if (pwflag)
pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple;
/* Assume the worst. */ /* Assume the worst. */
validated = VALIDATE_NOT_OK | FLAG_NO_HOST | FLAG_NO_USER; validated = VALIDATE_NOT_OK | FLAG_NO_HOST | FLAG_NO_USER;
if (pwflag && list_pw == NULL) if (pwflag && list_pw == NULL)
@@ -125,6 +117,9 @@ sudoers_lookup(pwflag)
*/ */
if (pwflag) { if (pwflag) {
int nopass = UNSPEC; int nopass = UNSPEC;
enum def_tupple pwcheck;
pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple;
CLR(validated, FLAG_NO_USER); CLR(validated, FLAG_NO_USER);
CLR(validated, FLAG_NO_HOST); CLR(validated, FLAG_NO_HOST);
@@ -151,11 +146,11 @@ sudoers_lookup(pwflag)
/* User has an entry for this host. */ /* User has an entry for this host. */
CLR(validated, VALIDATE_NOT_OK); CLR(validated, VALIDATE_NOT_OK);
SET(validated, VALIDATE_OK); SET(validated, VALIDATE_OK);
if (pwcheck == always && def_authenticate)
SET(validated, FLAG_CHECK_USER);
else if (pwcheck == never || nopass == TRUE)
def_authenticate = FALSE;
} }
if (pwcheck == always && def_authenticate)
SET(validated, FLAG_CHECK_USER);
else if (pwcheck == never || nopass == TRUE)
def_authenticate = FALSE;
return(validated); return(validated);
} }