===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/pathnames.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/sudo/Attic/pathnames.h.in	2008/07/31 16:44:03	1.6
--- src/usr.bin/sudo/Attic/pathnames.h.in	2008/11/14 11:58:08	1.7
***************
*** 18,24 ****
   * 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 $
   */
  
  /*
--- 18,24 ----
   * 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.63 2008/11/10 13:07:38 millert Exp $
   */
  
  /*
***************
*** 45,67 ****
  #define _PATH_DEFPATH		"/usr/bin:/bin"
  #endif /* _PATH_DEFPATH */
  
  /*
!  * NOTE: _PATH_SUDOERS is usually overriden 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.
   */
  
--- 45,62 ----
  #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 overridden by the Makefile.
   */
  #ifndef _PATH_SUDOERS
  #define _PATH_SUDOERS		"/etc/sudoers"
  #endif /* _PATH_SUDOERS */
  
  /*
   * The following paths are controlled via the configure script.
   */
  
***************
*** 89,94 ****
--- 84,93 ----
  #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,110 ****
  #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 */
--- 100,105 ----
***************
*** 117,126 ****
  #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 */
--- 112,129 ----
  #define	_PATH_USRTMP	"/usr/tmp/"
  #endif /* _PATH_USRTMP */
  
+ #ifndef _PATH_SUDO_SESH
+ #undef _PATH_SUDO_SESH
+ #endif /* _PATH_SUDO_SESH */
+ 
  #ifndef _PATH_LDAP_CONF
! #undef	_PATH_LDAP_CONF
  #endif /* _PATH_LDAP_CONF */
  
  #ifndef _PATH_LDAP_SECRET
! #undef	_PATH_LDAP_SECRET
  #endif /* _PATH_LDAP_SECRET */
+ 
+ #ifndef _PATH_NSSWITCH_CONF
+ #undef	_PATH_NSSWITCH_CONF
+ #endif /* _PATH_NSSWITCH_CONF */