Update to sudo 1.6.8p1

1 files changed, 20 insertions, 59 deletions

diff --git a/usr.bin/sudo/pathnames.h b/usr.bin/sudo/pathnames.h
index d16efb243d6..117b56c14cc 100644
--- a/usr.bin/sudo/pathnames.h
+++ b/usr.bin/sudo/pathnames.h
@@ -1,62 +1,35 @@
 /*
- * Copyright (c) 1996, 1998, 1999, 2001
- *	Todd C. Miller <Todd.Miller@courtesan.com>.  All rights reserved.
+ * Copyright (c) 1996, 1998, 1999, 2001, 2004
+ *	Todd C. Miller <Todd.Miller@courtesan.com>.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * 4. Products derived from this software may not be called "Sudo" nor
- *    may "Sudo" appear in their names without specific prior written
- *    permission from the author.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Sponsored in part by the Defense Advanced Research Projects
  * 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.46 2003/04/16 00:42:10 millert Exp $
+ * $Sudo: pathnames.h.in,v 1.52 2004/08/27 03:44:35 aaron Exp $
  */
 
 /*
  *  Pathnames to programs and files used by sudo.
  */
 
-#ifdef HAVE_PATHS_H
 #include <paths.h>
-#endif /* HAVE_PATHS_H */
-
-#ifndef _PATH_DEV
-#define _PATH_DEV		"/dev/"
-#endif /* _PATH_DEV */
 
-#ifndef _PATH_TTY
-#define _PATH_TTY		"/dev/tty"
-#endif /* _PATH_TTY */
+#define _PATH_SUDO_SENDMAIL _PATH_SENDMAIL
 
-#ifndef _PATH_DEFPATH
-#define _PATH_DEFPATH		"/usr/bin:/bin"
-#endif /* _PATH_DEFPATH */
+#define _PATH_MV "/bin/mv"
 
 /*
  * NOTE: _PATH_SUDOERS is usually overriden by the Makefile.
@@ -79,8 +52,8 @@
  */
 
 /*
- * Where to put the timestamp files.  Defaults to /var/run/sudo if
- * /var/run exists, else /tmp/.odus.
+ * Where to put the timestamp files.  Defaults to /var/run/sudo,
+ * /var/adm/sudo or /usr/adm/sudo depending on what exists.
  */
 #ifndef _PATH_SUDO_TIMEDIR
 #define _PATH_SUDO_TIMEDIR "/var/run/sudo"
@@ -94,18 +67,6 @@
 #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"
 #endif /* _PATH_SUDO_LOGFILE */
 
-#ifndef _PATH_SUDO_SENDMAIL
-#define _PATH_SUDO_SENDMAIL "/usr/sbin/sendmail"
-#endif /* _PATH_SUDO_SENDMAIL */
-
-#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 */
+/*
+ * Note: _PATH_SUDO_NOEXEC is set by lib/Makefile, not here.
+ */