diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2007-11-02 19:16:48 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2007-11-02 19:16:48 +0000 |
| commit | 42ad3108cf13b9e8babeecff88713c7168021d37 (patch) | |
| tree | f7cfda430b8a8e9f76557d782365d5dca582ac2d | |
| parent | 03bcc5d9b98a2c6badfbd6d0087fcbb7aac2b452 (diff) | |
update to sudo 1.6.9p8
| -rw-r--r-- | usr.bin/sudo/CHANGES | 6 | ||||
| -rw-r--r-- | usr.bin/sudo/Makefile.in | 4 | ||||
| -rw-r--r-- | usr.bin/sudo/parse.yacc | 7 | ||||
| -rw-r--r-- | usr.bin/sudo/version.h | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/usr.bin/sudo/CHANGES b/usr.bin/sudo/CHANGES index 41812ca4238..a3797a3f151 100644 --- a/usr.bin/sudo/CHANGES +++ b/usr.bin/sudo/CHANGES @@ -1987,3 +1987,9 @@ Sudo 1.6.9p6 released. AF_INET6 but have no real IPv6 support. Sudo 1.6.9p7 released. + +629) Fixed a bug where a sudoers entry with no runas user specified + was treated differently from a line with the default runas + user specified. + +Sudo 1.6.9p8 released. diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in index 19ebf6f09ff..caa2fc5ab1a 100644 --- a/usr.bin/sudo/Makefile.in +++ b/usr.bin/sudo/Makefile.in @@ -20,7 +20,7 @@ # # @configure_input@ # -# $Sudo: Makefile.in,v 1.246.2.17 2007/10/25 15:52:02 millert Exp $ +# $Sudo: Makefile.in,v 1.246.2.18 2007/11/02 19:15:16 millert Exp $ # #### Start of system configuration section. #### @@ -131,7 +131,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS) LIBOBJS = @LIBOBJS@ @ALLOCA@ -VERSION = 1.6.9p7 +VERSION = 1.6.9p8 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \ LICENSE Makefile.in PORTING README README.LDAP \ diff --git a/usr.bin/sudo/parse.yacc b/usr.bin/sudo/parse.yacc index de81cafc238..7684fb89aa3 100644 --- a/usr.bin/sudo/parse.yacc +++ b/usr.bin/sudo/parse.yacc @@ -69,7 +69,7 @@ #endif /* HAVE_LSEARCH */ #ifndef lint -__unused static const char rcsid[] = "$Sudo: parse.yacc,v 1.204.2.7 2007/09/13 23:06:51 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: parse.yacc,v 1.204.2.8 2007/11/02 19:09:01 millert Exp $"; #endif /* lint */ /* @@ -505,9 +505,8 @@ runasspec : /* empty */ { * then check against default runas user. */ if (runas_matches == UNSPEC) { - runas_matches = - userpw_matches(def_runas_default, - *user_runas, runas_pw); + runas_matches = userpw_matches(def_runas_default, + *user_runas, runas_pw) ? TRUE : NOMATCH; } } | RUNAS runaslist { diff --git a/usr.bin/sudo/version.h b/usr.bin/sudo/version.h index a069cfb20ad..4a95e867dff 100644 --- a/usr.bin/sudo/version.h +++ b/usr.bin/sudo/version.h @@ -17,12 +17,12 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F39502-99-1-0512. * - * $Sudo: version.h,v 1.66.2.10 2007/10/25 15:52:03 millert Exp $ + * $Sudo: version.h,v 1.66.2.11 2007/11/02 19:15:16 millert Exp $ */ #ifndef _SUDO_VERSION_H #define _SUDO_VERSION_H -static const char version[] = "1.6.9p7"; +static const char version[] = "1.6.9p8"; #endif /* _SUDO_VERSION_H */ |