X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=pathnames.h.in;h=96c4523000b3db62f781a13590bc1e204e085905;hb=5c8f8bf137761b6776ee46ad1c509ba55eb07401;hp=cef07932eb6f0c66edcd5a366704d26d7c027018;hpb=1de836999bb812865b719d5be5c455cb57c76158;p=debian%2Fsudo

diff --git a/pathnames.h.in b/pathnames.h.in
index cef0793..96c4523 100644
--- a/pathnames.h.in
+++ b/pathnames.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1998, 1999, 2001, 2004
+ * Copyright (c) 1996, 1998, 1999, 2001, 2004, 2005, 2007-2010
  *	Todd C. Miller <Todd.Miller@courtesan.com>.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,8 +17,6 @@
  * 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.51.2.3 2007/06/19 21:25:48 millert Exp $
  */
 
 /*
@@ -29,6 +27,10 @@
 #include <paths.h>
 #endif /* HAVE_PATHS_H */
 
+#ifdef HAVE_MAILLOCK_H
+#include <maillock.h>
+#endif /* HAVE_MAILLOCK_H */
+
 #ifndef _PATH_DEV
 #define _PATH_DEV		"/dev/"
 #endif /* _PATH_DEV */
@@ -45,22 +47,21 @@
 #define _PATH_DEFPATH		"/usr/bin:/bin"
 #endif /* _PATH_DEFPATH */
 
+#ifndef _PATH_STDPATH
+#define _PATH_STDPATH		"/usr/bin:/bin:/usr/sbin:/sbin"
+#endif /* _PATH_STDPATH */
+
+#ifndef _PATH_ENVIRONMENT
+#define _PATH_ENVIRONMENT	"/etc/environment"
+#endif /* _PATH_ENVIRONMENT */
+
 /*
- * NOTE: _PATH_SUDOERS is usually overriden by the Makefile.
+ * NOTE: _PATH_SUDOERS is usually overridden by the Makefile.
  */
 #ifndef _PATH_SUDOERS
 #define _PATH_SUDOERS		"/etc/sudoers"
 #endif /* _PATH_SUDOERS */
 
-/*
- * NOTE:  _PATH_SUDOERS_TMP is usually overriden by the Makefile.
- *        _PATH_SUDOERS_TMP *MUST* be on the same partition
- *        as _PATH_SUDOERS!
- */
-#ifndef _PATH_SUDOERS_TMP
-#define _PATH_SUDOERS_TMP	"/etc/sudoers.tmp"
-#endif /* _PATH_SUDOERS_TMP */
-
 /*
  * The following paths are controlled via the configure script.
  */
@@ -73,6 +74,14 @@
 #undef _PATH_SUDO_TIMEDIR
 #endif /* _PATH_SUDO_TIMEDIR */
 
+/*
+ * Where to put the I/O log files.  Defaults to /var/log/sudo-io,
+ * /var/adm/sudo-io or /usr/adm/sudo-io depending on what exists.
+ */
+#ifndef _PATH_SUDO_IO_LOGDIR
+#undef _PATH_SUDO_IO_LOGDIR
+#endif /* _PATH_SUDO_IO_LOGDIR */
+
 /*
  * Where to put the sudo log file when logging to a file.  Defaults to
  * /var/log/sudo.log if /var/log exists, else /var/adm/sudo.log.
@@ -89,6 +98,10 @@
 #undef _PATH_SUDO_NOEXEC
 #endif /* _PATH_SUDO_NOEXEC */
 
+#ifndef _PATH_SUDO_ASKPASS
+#undef _PATH_SUDO_ASKPASS
+#endif /* _PATH_SUDO_ASKPASS */
+
 #ifndef _PATH_VI
 #undef _PATH_VI
 #endif /* _PATH_VI */
@@ -113,10 +126,26 @@
 #define	_PATH_USRTMP	"/usr/tmp/"
 #endif /* _PATH_USRTMP */
 
+#ifndef _PATH_MAILDIR
+#undef _PATH_MAILDIR
+#endif /* _PATH_MAILDIR */
+
+#ifndef _PATH_SUDO_SESH
+#undef _PATH_SUDO_SESH
+#endif /* _PATH_SUDO_SESH */
+
 #ifndef _PATH_LDAP_CONF
-#define	_PATH_LDAP_CONF	"/etc/ldap.conf"
+#undef	_PATH_LDAP_CONF
 #endif /* _PATH_LDAP_CONF */
 
 #ifndef _PATH_LDAP_SECRET
-#define _PATH_LDAP_SECRET	"/etc/ldap.secret"
+#undef	_PATH_LDAP_SECRET
 #endif /* _PATH_LDAP_SECRET */
+
+#ifndef _PATH_NSSWITCH_CONF
+#undef	_PATH_NSSWITCH_CONF
+#endif /* _PATH_NSSWITCH_CONF */
+
+#ifndef _PATH_NETSVC_CONF
+#undef	_PATH_NETSVC_CONF
+#endif /* _PATH_NETSVC_CONF */