From 8aec67fefda022f0a0c3fb8800e75cfe6e51b690 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 14 May 2008 12:03:43 -0600 Subject: [PATCH] Imported Upstream version 1.6.8p12 --- CHANGES | 15 +++++++++++++++ Makefile.in | 2 +- env.c | 6 ++++++ sudo.cat | 18 +++++++++--------- sudo.man.in | 2 +- sudoers.cat | 46 +++++++++++++++++++++++----------------------- sudoers.man.in | 2 +- version.h | 2 +- visudo.cat | 6 +++--- visudo.man.in | 2 +- 10 files changed, 61 insertions(+), 40 deletions(-) diff --git a/CHANGES b/CHANGES index 221d7bd..2ab4d68 100644 --- a/CHANGES +++ b/CHANGES @@ -1793,3 +1793,18 @@ Sudo 1.6.8p8 released. safe_cmnd. Sudo 1.6.8p9 released. + +567) Added PS4 and SHELLOPTS to the list of variables to remove from + the environment. + +Sudo 1.6.8p10 released. + +567) Added JAVA_TOOL_OPTIONS to the list of variables to remove from + the environment. + +Sudo 1.6.8p11 released. + +567) Added PERLLIB, PERL5LIB and PERL5OPT to the list of variables to + remove from the environment. + +Sudo 1.6.8p12 released. diff --git a/Makefile.in b/Makefile.in index 58f78d4..893ac81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,7 +130,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS) LIBOBJS = @LIBOBJS@ @ALLOCA@ -VERSION = 1.6.8p9 +VERSION = 1.6.8p12 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \ LICENSE Makefile.in PORTING README README.LDAP RUNSON TODO \ diff --git a/env.c b/env.c index 9d3a765..6f55503 100644 --- a/env.c +++ b/env.c @@ -124,6 +124,12 @@ static const char *initial_badenv_table[] = { "TERMCAP", /* XXX - only if it starts with '/' */ "ENV", "BASH_ENV", + "PS4", + "SHELLOPTS", + "JAVA_TOOL_OPTIONS", + "PERLLIB", + "PERL5LIB", + "PERL5OPT", NULL }; diff --git a/sudo.cat b/sudo.cat index fdca4d8..c5d7434 100644 --- a/sudo.cat +++ b/sudo.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.6.8p9 June, 20 2005 1 +1.6.8p12 June, 20 2005 1 @@ -127,7 +127,7 @@ OOPPTTIIOONNSS -1.6.8p9 June, 20 2005 2 +1.6.8p12 June, 20 2005 2 @@ -193,7 +193,7 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.6.8p9 June, 20 2005 3 +1.6.8p12 June, 20 2005 3 @@ -259,7 +259,7 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.6.8p9 June, 20 2005 4 +1.6.8p12 June, 20 2005 4 @@ -325,7 +325,7 @@ SSEECCUURRIITTYY NNOOTTEESS -1.6.8p9 June, 20 2005 5 +1.6.8p12 June, 20 2005 5 @@ -391,7 +391,7 @@ EENNVVIIRROONNMMEENNTT -1.6.8p9 June, 20 2005 6 +1.6.8p12 June, 20 2005 6 @@ -457,7 +457,7 @@ AAUUTTHHOORRSS -1.6.8p9 June, 20 2005 7 +1.6.8p12 June, 20 2005 7 @@ -523,7 +523,7 @@ DDIISSCCLLAAIIMMEERR -1.6.8p9 June, 20 2005 8 +1.6.8p12 June, 20 2005 8 @@ -589,6 +589,6 @@ SUDO(1m) MAINTENANCE COMMANDS SUDO(1m) -1.6.8p9 June, 20 2005 9 +1.6.8p12 June, 20 2005 9 diff --git a/sudo.man.in b/sudo.man.in index 773886a..a733db5 100644 --- a/sudo.man.in +++ b/sudo.man.in @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "SUDO @mansectsu@" -.TH SUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" +.TH SUDO @mansectsu@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS" .SH "NAME" sudo, sudoedit \- execute a command as another user .SH "SYNOPSIS" diff --git a/sudoers.cat b/sudoers.cat index 8be0790..41d3489 100644 --- a/sudoers.cat +++ b/sudoers.cat @@ -61,7 +61,7 @@ DDEESSCCRRIIPPTTIIOONN -1.6.8p9 June, 20 2005 1 +1.6.8p12 June, 20 2005 1 @@ -127,7 +127,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 2 +1.6.8p12 June, 20 2005 2 @@ -193,7 +193,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 3 +1.6.8p12 June, 20 2005 3 @@ -259,7 +259,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 4 +1.6.8p12 June, 20 2005 4 @@ -325,7 +325,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 5 +1.6.8p12 June, 20 2005 5 @@ -391,7 +391,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 6 +1.6.8p12 June, 20 2005 6 @@ -457,7 +457,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 7 +1.6.8p12 June, 20 2005 7 @@ -523,7 +523,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 8 +1.6.8p12 June, 20 2005 8 @@ -589,7 +589,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 9 +1.6.8p12 June, 20 2005 9 @@ -655,7 +655,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 10 +1.6.8p12 June, 20 2005 10 @@ -721,7 +721,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 11 +1.6.8p12 June, 20 2005 11 @@ -787,7 +787,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 12 +1.6.8p12 June, 20 2005 12 @@ -853,7 +853,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 13 +1.6.8p12 June, 20 2005 13 @@ -919,7 +919,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 14 +1.6.8p12 June, 20 2005 14 @@ -985,7 +985,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 15 +1.6.8p12 June, 20 2005 15 @@ -1051,7 +1051,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 16 +1.6.8p12 June, 20 2005 16 @@ -1117,7 +1117,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 17 +1.6.8p12 June, 20 2005 17 @@ -1183,7 +1183,7 @@ EEXXAAMMPPLLEESS -1.6.8p9 June, 20 2005 18 +1.6.8p12 June, 20 2005 18 @@ -1249,7 +1249,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 19 +1.6.8p12 June, 20 2005 19 @@ -1315,7 +1315,7 @@ SUDOERS(4) MAINTENANCE COMMANDS SUDOERS(4) -1.6.8p9 June, 20 2005 20 +1.6.8p12 June, 20 2005 20 @@ -1381,7 +1381,7 @@ PPRREEVVEENNTTIINNGG SSHHEELLLL EESSCCAAPPEESS -1.6.8p9 June, 20 2005 21 +1.6.8p12 June, 20 2005 21 @@ -1447,7 +1447,7 @@ CCAAVVEEAATTSS -1.6.8p9 June, 20 2005 22 +1.6.8p12 June, 20 2005 22 @@ -1513,6 +1513,6 @@ DDIISSCCLLAAIIMMEERR -1.6.8p9 June, 20 2005 23 +1.6.8p12 June, 20 2005 23 diff --git a/sudoers.man.in b/sudoers.man.in index 3acbd3a..101a3d0 100644 --- a/sudoers.man.in +++ b/sudoers.man.in @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "SUDOERS @mansectform@" -.TH SUDOERS @mansectform@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" +.TH SUDOERS @mansectform@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS" .SH "NAME" sudoers \- list of which users may execute what .SH "DESCRIPTION" diff --git a/version.h b/version.h index 12c46a2..3c2bc4c 100644 --- a/version.h +++ b/version.h @@ -23,6 +23,6 @@ #ifndef _SUDO_VERSION_H #define _SUDO_VERSION_H -static const char version[] = "1.6.8p9"; +static const char version[] = "1.6.8p12"; #endif /* _SUDO_VERSION_H */ diff --git a/visudo.cat b/visudo.cat index 6eb2a7f..c1be352 100644 --- a/visudo.cat +++ b/visudo.cat @@ -61,7 +61,7 @@ OOPPTTIIOONNSS -1.6.8p9 June, 20 2005 1 +1.6.8p12 June, 20 2005 1 @@ -127,7 +127,7 @@ DDIIAAGGNNOOSSTTIICCSS -1.6.8p9 June, 20 2005 2 +1.6.8p12 June, 20 2005 2 @@ -193,6 +193,6 @@ DDIISSCCLLAAIIMMEERR -1.6.8p9 June, 20 2005 3 +1.6.8p12 June, 20 2005 3 diff --git a/visudo.man.in b/visudo.man.in index 26f6e32..ad8e8c4 100644 --- a/visudo.man.in +++ b/visudo.man.in @@ -149,7 +149,7 @@ .\" ======================================================================== .\" .IX Title "VISUDO @mansectsu@" -.TH VISUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS" +.TH VISUDO @mansectsu@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS" .SH "NAME" visudo \- edit the sudoers file .SH "SYNOPSIS" -- 2.30.2