Update to sudo 1.6.9p1. Note that the environment handling in sudo

1.6.9 has changed relative to older versions.  Sudo now starts
commands with a minimal environment containing the variables in the
env_keep and env_check lists.  This behavior is configurable in the
sudoers file.  Please see the "SECURITY NOTES" section in the sudo
manual.

1 files changed, 79 insertions, 59 deletions

diff --git a/usr.bin/sudo/config.h b/usr.bin/sudo/config.h
index cfdc91667e0..c4779916c0c 100644
--- a/usr.bin/sudo/config.h
+++ b/usr.bin/sudo/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.3 2004/11/29 17:29:04 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.4 2007/07/26 16:10:15 millert Exp $	*/
 
 #ifndef _SUDO_CONFIG_H
 #define _SUDO_CONFIG_H
@@ -8,55 +8,74 @@
  *	     --with-env-editor --disable-path-info --with-logfac=authpriv
  */
 
-#define HAVE_ASPRINTF
-#define HAVE_BSD_AUTH_H
-#define HAVE_CLOSEFROM
-#define HAVE_DIRENT_H
-#define HAVE_ERR_H
-#define HAVE_FNMATCH
-#define HAVE_FREEIFADDRS
-#define HAVE_FSTAT
-#define HAVE_FUTIMES
-#define HAVE_GETCWD
-#define HAVE_GETDOMAINNAME
-#define HAVE_GETIFADDRS
-#define HAVE_GETTIMEOFDAY
-#define HAVE_INITGROUPS
-#define HAVE_INNETGR
-#define HAVE_INTTYPES_H
-#define HAVE_ISBLANK
-#define HAVE_LOCKF
-#define HAVE_LOGIN_CAP_H
-#define HAVE_LSEARCH
-#define HAVE_MEMCPY
-#define HAVE_MEMSET
-#define HAVE_NETGROUP_H
-#define HAVE_SETRESUID
-#define HAVE_SETRLIMIT
-#define HAVE_SIGACTION
-#define HAVE_SIG_ATOMIC_T
-#define HAVE_SNPRINTF
-#define HAVE_STDLIB_H
-#define HAVE_STRCASECMP
-#define HAVE_STRCHR
-#define HAVE_STRERROR
-#define HAVE_STRFTIME
-#define HAVE_STRING_H
-#define HAVE_STRLCAT
-#define HAVE_STRLCPY
-#define HAVE_STRRCHR
-#define HAVE_ST_MTIMESPEC
-#define HAVE_SYS_SELECT_H
-#define HAVE_SYS_STAT_H
-#define HAVE_SYS_TYPES_H
-#define HAVE_TERMIOS_H
-#define HAVE_TIMESPEC
-#define HAVE_TZSET
-#define HAVE_UNISTD_H
-#define HAVE_UTIMES
-#define HAVE_VASPRINTF
-#define HAVE_VSNPRINTF
-#define HAVE___PROGNAME
+#define HAVE_ASPRINTF 1
+#define HAVE_BSD_AUTH_H 1
+#define HAVE_CLOSEFROM 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DIRFD 1
+#define HAVE_ERR_H 1
+#define HAVE_EXTENDED_GLOB 1
+#define HAVE_FNMATCH 1
+#define HAVE_FREEIFADDRS 1
+#define HAVE_FSTAT 1
+#define HAVE_FUTIMES 1
+#define HAVE_GETCWD 1
+#define HAVE_GETDOMAINNAME 1
+#define HAVE_GETGROUPS 1
+#define HAVE_GETIFADDRS 1
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GLOB 1
+#define HAVE_INITGROUPS 1
+#define HAVE_INNETGR 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_ISBLANK 1
+#define HAVE_LOCKF 1
+#define HAVE_LOGIN_CAP_H 1
+#define HAVE_LONG_LONG 1
+#define HAVE_LSEARCH 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMCHR 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MEMSET 1
+#define HAVE_MKSTEMP 1
+#define HAVE_NETGROUP_H 1
+#define HAVE_PATHS_H 1
+#define HAVE_SA_LEN 1
+#define HAVE_SETEUID 1
+#define HAVE_SETLOCALE 1
+#define HAVE_SETRESUID 1
+#define HAVE_SETRLIMIT 1
+#define HAVE_SIGACTION 1
+#define HAVE_SIG_ATOMIC_T 1
+#define HAVE_SNPRINTF 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRLCAT 1
+#define HAVE_STRLCPY 1
+#define HAVE_STRRCHR 1
+#define HAVE_ST_MTIMESPEC 1
+#define HAVE_SYSCONF 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_SOCKIO_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_TERMIOS_H 1
+#define HAVE_TIMESPEC 1
+#define HAVE_TZSET 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UTIMES 1
+#define HAVE_UTIME_H 1
+#define HAVE_VASPRINTF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_WAITPID 1
+#define HAVE___PROGNAME 1
 
 #define CLASSIC_INSULTS 1
 #define CSOPS_INSULTS 1
@@ -66,6 +85,7 @@
 #define INCORRECT_PASSWORD "Sorry, try again."
 #define LOGFAC "authpriv"
 #define LOGGING SLOG_SYSLOG
+#define LONG_IS_QUAD 1
 #define MAILSUBJECT "*** SECURITY information for %h ***"
 #define MAILTO "root"
 #define MAXLOGFILELEN 80
@@ -79,27 +99,27 @@
 #define SEND_MAIL_WHEN_NO_USER 1
 #define STDC_HEADERS 1
 #define SUDO_UMASK 0022
-#define	SUDOERS_UID 0
-#define	SUDOERS_GID 0
-#define	SUDOERS_MODE 0440
+#define SUDOERS_UID 0
+#define SUDOERS_GID 0
+#define SUDOERS_MODE 0440
 #define TIMEOUT 5
+#define TIME_WITH_SYS_TIME 1
 #define TRIES_FOR_PASSWORD 3
 #define USE_INSULTS 1
 #define VOID void
 #define WITHOUT_PASSWD 1
 
 #define sudo_waitpid(p, s, o)	waitpid(p, s, o)
-#define	stat_sudoers	lstat
-#define EXECV	execvp
+#define stat_sudoers		lstat
 
 #define mtim_getsec(_x)		((_x).st_mtimespec.tv_sec)
-#define mtim_getnsec(_x)	((_x).st_mtimespec.tv_nsec)
+#define mtim_getnsec(_x)	(((_x).st_mtimespec.tv_nsec / 1000) * 1000)
 
 #undef SET
-#define	SET(t, f)	((t) |= (f))
+#define SET(t, f)	((t) |= (f))
 #undef CLR
-#define	CLR(t, f)	((t) &= ~(f))
+#define CLR(t, f)	((t) &= ~(f))
 #undef ISSET
-#define	ISSET(t, f)	((t) & (f))
+#define ISSET(t, f)     ((t) & (f))
 
 #endif /* _SUDO_CONFIG_H */