summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2008-12-08 16:50:06 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2008-12-08 16:50:06 +0000
commitede7c75fd01889b9a6b965f689e1f1d525c45042 (patch)
tree2b56358978bbf816a0a495c2488a8ac62e871abb
parentb268c384b6530b1d656d94ca393ab864e027ac03 (diff)
Do not short circuit pseudo commands when we get a match since, depending
on the settings, we may need to examine all commands for tags.
-rw-r--r--usr.bin/sudo/parse.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/usr.bin/sudo/parse.c b/usr.bin/sudo/parse.c
index c955097c1f9..7452bcdf442 100644
--- a/usr.bin/sudo/parse.c
+++ b/usr.bin/sudo/parse.c
@@ -192,12 +192,9 @@ sudo_file_lookup(nss, validated, pwflag)
if ((pwcheck == any && nopass != TRUE) ||
(pwcheck == all && nopass != FALSE))
nopass = cs->tags.nopasswd;
- if (match == ALLOW)
- goto matched_pseudo;
}
}
}
- matched_pseudo:
if (match == ALLOW || user_uid == 0) {
/* User has an entry for this host. */
SET(validated, VALIDATE_OK);