[BACK]Return to pathnames.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/pathnames.h between version 1.1 and 1.2

version 1.1, 2004/01/15 21:32:03 version 1.2, 2004/09/28 15:10:51
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 1996, 1998, 1999, 2001   * Copyright (c) 1996, 1998, 1999, 2001, 2004
  *      Todd C. Miller <Todd.Miller@courtesan.com>.  All rights reserved.   *      Todd C. Miller <Todd.Miller@courtesan.com>.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Permission to use, copy, modify, and distribute this software for any
  * modification, are permitted provided that the following conditions   * purpose with or without fee is hereby granted, provided that the above
  * are met:   * copyright notice and this permission notice appear in all copies.
  *   *
  * 1. Redistributions of source code must retain the above copyright   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *    notice, this list of conditions and the following disclaimer.   * 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.
  *   *
  * 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   * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force   * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.   * 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.   *  Pathnames to programs and files used by sudo.
  */   */
   
 #ifdef HAVE_PATHS_H  
 #include <paths.h>  #include <paths.h>
 #endif /* HAVE_PATHS_H */  
   
 #ifndef _PATH_DEV  #define _PATH_SUDO_SENDMAIL _PATH_SENDMAIL
 #define _PATH_DEV               "/dev/"  
 #endif /* _PATH_DEV */  
   
 #ifndef _PATH_TTY  #define _PATH_MV "/bin/mv"
 #define _PATH_TTY               "/dev/tty"  
 #endif /* _PATH_TTY */  
   
 #ifndef _PATH_DEFPATH  
 #define _PATH_DEFPATH           "/usr/bin:/bin"  
 #endif /* _PATH_DEFPATH */  
   
 /*  /*
  * NOTE: _PATH_SUDOERS is usually overriden by the Makefile.   * NOTE: _PATH_SUDOERS is usually overriden by the Makefile.
  */   */
Line 79 
Line 52 
  */   */
   
 /*  /*
  * Where to put the timestamp files.  Defaults to /var/run/sudo if   * Where to put the timestamp files.  Defaults to /var/run/sudo,
  * /var/run exists, else /tmp/.odus.   * /var/adm/sudo or /usr/adm/sudo depending on what exists.
  */   */
 #ifndef _PATH_SUDO_TIMEDIR  #ifndef _PATH_SUDO_TIMEDIR
 #define _PATH_SUDO_TIMEDIR "/var/run/sudo"  #define _PATH_SUDO_TIMEDIR "/var/run/sudo"
Line 94 
Line 67 
 #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"  #define _PATH_SUDO_LOGFILE "/var/log/sudo.log"
 #endif /* _PATH_SUDO_LOGFILE */  #endif /* _PATH_SUDO_LOGFILE */
   
 #ifndef _PATH_SUDO_SENDMAIL  /*
 #define _PATH_SUDO_SENDMAIL "/usr/sbin/sendmail"   * Note: _PATH_SUDO_NOEXEC is set by lib/Makefile, not here.
 #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 */  
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2