===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/pathnames.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/sudo/Attic/pathnames.h.in	2003/04/19 21:57:17	1.3
--- src/usr.bin/sudo/Attic/pathnames.h.in	2004/09/28 15:10:51	1.4
***************
*** 1,41 ****
  /*
!  * Copyright (c) 1996, 1998, 1999, 2001
!  *	Todd C. Miller <Todd.Miller@courtesan.com>.  All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * 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.
-  *
   * 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 $
   */
  
  /*
--- 1,24 ----
  /*
!  * Copyright (c) 1996, 1998, 1999, 2001, 2004
!  *	Todd C. Miller <Todd.Miller@courtesan.com>.
   *
!  * 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.
   *
!  * 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.52 2004/08/27 03:44:35 aaron Exp $
   */
  
  /*
***************
*** 79,86 ****
   */
  
  /*
!  * Where to put the timestamp files.  Defaults to /var/run/sudo if
!  * /var/run exists, else /tmp/.odus.
   */
  #ifndef _PATH_SUDO_TIMEDIR
  #undef _PATH_SUDO_TIMEDIR
--- 62,69 ----
   */
  
  /*
!  * 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
  #undef _PATH_SUDO_TIMEDIR
***************
*** 98,103 ****
--- 81,90 ----
  #undef _PATH_SUDO_SENDMAIL
  #endif /* _PATH_SUDO_SENDMAIL */
  
+ #ifndef _PATH_SUDO_NOEXEC
+ #undef _PATH_SUDO_NOEXEC
+ #endif /* _PATH_SUDO_NOEXEC */
+ 
  #ifndef _PATH_VI
  #undef _PATH_VI
  #endif /* _PATH_VI */
***************
*** 109,111 ****
--- 96,114 ----
  #ifndef _PATH_BSHELL
  #undef _PATH_BSHELL
  #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 */