summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2007-12-04 15:27:06 +0000
committermillert <millert@openbsd.org>2007-12-04 15:27:06 +0000
commit498105fe306b0470733ecc37767fb2c9efd10bd1 (patch)
treeaad80e247999e51e1975d3bb1edf6bcb3440fbb1
parentrevert SIGQUIT catching; requested by deraadt (diff)
downloadwireguard-openbsd-498105fe306b0470733ecc37767fb2c9efd10bd1.tar.xz
wireguard-openbsd-498105fe306b0470733ecc37767fb2c9efd10bd1.zip
missing change from 1.6.9p9
-rw-r--r--usr.bin/sudo/parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/sudo/parse.c b/usr.bin/sudo/parse.c
index 68e197987f1..ce943f64eff 100644
--- a/usr.bin/sudo/parse.c
+++ b/usr.bin/sudo/parse.c
@@ -90,7 +90,7 @@
#endif /* HAVE_EXTENDED_GLOB */
#ifndef lint
-__unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.14 2007/10/24 16:43:27 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.15 2007/12/04 15:26:40 millert Exp $";
#endif /* lint */
/*
@@ -202,7 +202,7 @@ sudoers_lookup(pwflag)
return(VALIDATE_OK |
(no_passwd == TRUE ? FLAG_NOPASS : 0) |
(no_execve == TRUE ? FLAG_NOEXEC : 0) |
- (setenv_ok == TRUE ? FLAG_SETENV : 0));
+ (setenv_ok >= TRUE ? FLAG_SETENV : 0));
} else if ((runas_matches == TRUE && cmnd_matches == FALSE) ||
(runas_matches == FALSE && cmnd_matches == TRUE)) {
/*
@@ -212,7 +212,7 @@ sudoers_lookup(pwflag)
return(VALIDATE_NOT_OK |
(no_passwd == TRUE ? FLAG_NOPASS : 0) |
(no_execve == TRUE ? FLAG_NOEXEC : 0) |
- (setenv_ok == TRUE ? FLAG_SETENV : 0));
+ (setenv_ok >= TRUE ? FLAG_SETENV : 0));
}
}
top--;