diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-19 22:00:09 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-19 22:00:09 +0000 |
commit | 2e5c48261179adc15f565023a7520fd314ac0588 (patch) | |
tree | 5b8882d626a630d3457372745daa74e93c2a3e96 /usr.bin | |
parent | 47adb4253e32a37f97b1b4a936ecc670f80c74f1 (diff) |
Update to sudo 1.6.8p9
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/sudo/CHANGES | 7 | ||||
-rw-r--r-- | usr.bin/sudo/Makefile.in | 2 | ||||
-rw-r--r-- | usr.bin/sudo/parse.yacc | 4 | ||||
-rw-r--r-- | usr.bin/sudo/sudo.8 | 2 | ||||
-rw-r--r-- | usr.bin/sudo/sudo.c | 10 | ||||
-rw-r--r-- | usr.bin/sudo/sudoers.5 | 2 | ||||
-rw-r--r-- | usr.bin/sudo/version.h | 2 | ||||
-rw-r--r-- | usr.bin/sudo/visudo.8 | 2 |
8 files changed, 14 insertions, 17 deletions
diff --git a/usr.bin/sudo/CHANGES b/usr.bin/sudo/CHANGES index a077edf8a56..221d7bd13fd 100644 --- a/usr.bin/sudo/CHANGES +++ b/usr.bin/sudo/CHANGES @@ -1786,3 +1786,10 @@ Sudo 1.6.8p7 released. 564) Fixed a bug that prevented Heimdal authentication from working. Sudo 1.6.8p8 released. + +565) Updated config.guess and config.sub entries for OpenBSD. + +566) A sudoers entry with sudo ALL no longer overwrites the value of + safe_cmnd. + +Sudo 1.6.8p9 released. diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in index e47dd5572a7..58f78d4525e 100644 --- a/usr.bin/sudo/Makefile.in +++ b/usr.bin/sudo/Makefile.in @@ -130,7 +130,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS) LIBOBJS = @LIBOBJS@ @ALLOCA@ -VERSION = 1.6.8p8 +VERSION = 1.6.8p9 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \ LICENSE Makefile.in PORTING README README.LDAP RUNSON TODO \ diff --git a/usr.bin/sudo/parse.yacc b/usr.bin/sudo/parse.yacc index c74125b784b..46dce221d82 100644 --- a/usr.bin/sudo/parse.yacc +++ b/usr.bin/sudo/parse.yacc @@ -676,10 +676,6 @@ cmnd : ALL { } $$ = TRUE; - - if (safe_cmnd) - free(safe_cmnd); - safe_cmnd = estrdup(user_cmnd); } | ALIAS { aliasinfo *aip; diff --git a/usr.bin/sudo/sudo.8 b/usr.bin/sudo/sudo.8 index 8c7a35b7cb4..9fd1a792298 100644 --- a/usr.bin/sudo/sudo.8 +++ b/usr.bin/sudo/sudo.8 @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "SUDO 8" -.TH SUDO 8 "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS" +.TH SUDO 8 "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" .SH "NAME" sudo, sudoedit \- execute a command as another user .SH "SYNOPSIS" diff --git a/usr.bin/sudo/sudo.c b/usr.bin/sudo/sudo.c index 858b968a54a..3313b000cfb 100644 --- a/usr.bin/sudo/sudo.c +++ b/usr.bin/sudo/sudo.c @@ -275,6 +275,8 @@ main(argc, argv, envp) /* Validate the user but don't search for pseudo-commands. */ validated = sudoers_lookup(pwflag); } + if (safe_cmnd == NULL) + safe_cmnd = user_cmnd; /* * If we are using set_perms_posix() and the stay_setuid flag was not set, @@ -391,14 +393,6 @@ main(argc, argv, envp) exit(0); } - /* This *must* have been set if we got a match but... */ - if (safe_cmnd == NULL) { - log_error(MSG_ONLY, - "internal error, safe_cmnd never got set for %s; %s", - user_cmnd, - "please report this error at http://courtesan.com/sudo/bugs/"); - } - /* Override user's umask if configured to do so. */ if (def_umask != 0777) (void) umask(def_umask); diff --git a/usr.bin/sudo/sudoers.5 b/usr.bin/sudo/sudoers.5 index 1b7bfd2d3a1..0d361e4f0e2 100644 --- a/usr.bin/sudo/sudoers.5 +++ b/usr.bin/sudo/sudoers.5 @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "SUDOERS 5" -.TH SUDOERS 5 "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS" +.TH SUDOERS 5 "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" .SH "NAME" sudoers \- list of which users may execute what .SH "DESCRIPTION" diff --git a/usr.bin/sudo/version.h b/usr.bin/sudo/version.h index 634ef596736..12c46a2311a 100644 --- a/usr.bin/sudo/version.h +++ b/usr.bin/sudo/version.h @@ -23,6 +23,6 @@ #ifndef _SUDO_VERSION_H #define _SUDO_VERSION_H -static const char version[] = "1.6.8p8"; +static const char version[] = "1.6.8p9"; #endif /* _SUDO_VERSION_H */ diff --git a/usr.bin/sudo/visudo.8 b/usr.bin/sudo/visudo.8 index fb7b8f74ce4..c8a145268f7 100644 --- a/usr.bin/sudo/visudo.8 +++ b/usr.bin/sudo/visudo.8 @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "VISUDO 8" -.TH VISUDO 8 "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS" +.TH VISUDO 8 "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" .SH "NAME" visudo \- edit the sudoers file .SH "SYNOPSIS" |