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, 57 insertions, 6 deletions

diff --git a/usr.bin/sudo/pathnames.h b/usr.bin/sudo/pathnames.h
index 117b56c14cc..67b0a8bb543 100644
--- a/usr.bin/sudo/pathnames.h
+++ b/usr.bin/sudo/pathnames.h
@@ -1,3 +1,4 @@
+/* pathnames.h.  Generated by configure.  */
 /*
  * Copyright (c) 1996, 1998, 1999, 2001, 2004
  *	Todd C. Miller <Todd.Miller@courtesan.com>.
@@ -18,18 +19,32 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * $Sudo: pathnames.h.in,v 1.52 2004/08/27 03:44:35 aaron Exp $
+ * $Sudo: pathnames.h.in,v 1.51.2.3 2007/06/19 21:25:48 millert Exp $
  */
 
 /*
  *  Pathnames to programs and files used by sudo.
  */
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif /* HAVE_PATHS_H */
 
-#define _PATH_SUDO_SENDMAIL _PATH_SENDMAIL
+#ifndef _PATH_DEV
+#define _PATH_DEV		"/dev/"
+#endif /* _PATH_DEV */
 
-#define _PATH_MV "/bin/mv"
+#ifndef _PATH_TTY
+#define _PATH_TTY		"/dev/tty"
+#endif /* _PATH_TTY */
+
+#ifndef _PATH_DEVNULL
+#define _PATH_DEVNULL		"/dev/null"
+#endif /* _PATH_DEVNULL */
+
+#ifndef _PATH_DEFPATH
+#define _PATH_DEFPATH		"/usr/bin:/bin"
+#endif /* _PATH_DEFPATH */
 
 /*
  * NOTE: _PATH_SUDOERS is usually overriden by the Makefile.
@@ -67,6 +82,42 @@
 #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"
 #endif /* _PATH_SUDO_LOGFILE */
 
-/*
- * Note: _PATH_SUDO_NOEXEC is set by lib/Makefile, not here.
- */
+#ifndef _PATH_SUDO_SENDMAIL
+#define _PATH_SUDO_SENDMAIL "/usr/sbin/sendmail"
+#endif /* _PATH_SUDO_SENDMAIL */
+
+#ifndef _PATH_SUDO_NOEXEC
+#define _PATH_SUDO_NOEXEC "/usr/libexec/sudo_noexec"
+#endif /* _PATH_SUDO_NOEXEC */
+
+#ifndef _PATH_VI
+#define _PATH_VI "/usr/bin/vi"
+#endif /* _PATH_VI */
+
+#ifndef _PATH_MV
+#define _PATH_MV "/bin/mv"
+#endif /* _PATH_MV */
+
+#ifndef _PATH_BSHELL
+#define _PATH_BSHELL "/bin/sh"
+#endif /* _PATH_BSHELL */
+
+#ifndef _PATH_TMP
+#define	_PATH_TMP	"/tmp/"
+#endif /* _PATH_TMP */
+
+#ifndef _PATH_VARTMP
+#define	_PATH_VARTMP	"/var/tmp/"
+#endif /* _PATH_VARTMP */
+
+#ifndef _PATH_USRTMP
+#define	_PATH_USRTMP	"/usr/tmp/"
+#endif /* _PATH_USRTMP */
+
+#ifndef _PATH_LDAP_CONF
+#define	_PATH_LDAP_CONF	"/etc/ldap.conf"
+#endif /* _PATH_LDAP_CONF */
+
+#ifndef _PATH_LDAP_SECRET
+#define _PATH_LDAP_SECRET	"/etc/ldap.secret"
+#endif /* _PATH_LDAP_SECRET */