Imported Upstream version 1.7.0

[debian/sudo] / pathnames.h.in

diff --git a/pathnames.h.in b/pathnames.h.in
index 3fc32495cf1d17ba7b96617d62b312777b1159a4..430f96a99ab7629b7b934e76885378d02844c882 100644 (file)
--- a/pathnames.h.in
+++ b/pathnames.h.in
@@ -18,7 +18,7 @@
  * 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.4 2008/02/09 14:44:48 millert Exp $
+ * $Sudo: pathnames.h.in,v 1.63 2008/11/10 13:07:38 millert Exp $
  */
 
 /*
@@ -45,22 +45,17 @@
 #define _PATH_DEFPATH          "/usr/bin:/bin"
 #endif /* _PATH_DEFPATH */
 
+#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.
  */
@@ -89,6 +84,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 */
@@ -101,10 +100,6 @@
 #undef _PATH_BSHELL
 #endif /* _PATH_BSHELL */
 
-#ifndef _PATH_SUDO_SESH
-#undef _PATH_SUDO_SESH
-#endif /* _PATH_SUDO_SESH */
-
 #ifndef _PATH_TMP
 #define        _PATH_TMP       "/tmp/"
 #endif /* _PATH_TMP */
@@ -117,10 +112,18 @@
 #define        _PATH_USRTMP    "/usr/tmp/"
 #endif /* _PATH_USRTMP */
 
+#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 */