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

Diff for /src/usr.bin/ssh/pathnames.h between version 1.9 and 1.9.2.2

version 1.9, 2001/06/23 02:34:30 version 1.9.2.2, 2002/03/08 15:17:18
Line 13 
Line 13 
  */   */
   
 #define ETCDIR                          "/etc"  #define ETCDIR                          "/etc"
   #define SSHDIR                          ETCDIR
 #define _PATH_SSH_PIDDIR                "/var/run"  #define _PATH_SSH_PIDDIR                "/var/run"
   
 /*  /*
  * System-wide file containing host keys of known hosts.  This file should be   * System-wide file containing host keys of known hosts.  This file should be
  * world-readable.   * world-readable.
  */   */
 #define _PATH_SSH_SYSTEM_HOSTFILE       ETCDIR "/ssh_known_hosts"  #define _PATH_SSH_SYSTEM_HOSTFILE       SSHDIR "/ssh_known_hosts"
 /* backward compat for protocol 2 */  /* backward compat for protocol 2 */
 #define _PATH_SSH_SYSTEM_HOSTFILE2      ETCDIR "/ssh_known_hosts2"  #define _PATH_SSH_SYSTEM_HOSTFILE2      SSHDIR "/ssh_known_hosts2"
   
 /*  /*
  * Of these, ssh_host_key must be readable only by root, whereas ssh_config   * Of these, ssh_host_key must be readable only by root, whereas ssh_config
  * should be world-readable.   * should be world-readable.
  */   */
 #define _PATH_SERVER_CONFIG_FILE        ETCDIR "/sshd_config"  #define _PATH_SERVER_CONFIG_FILE        SSHDIR "/sshd_config"
 #define _PATH_HOST_CONFIG_FILE          ETCDIR "/ssh_config"  #define _PATH_HOST_CONFIG_FILE          SSHDIR "/ssh_config"
 #define _PATH_HOST_KEY_FILE             ETCDIR "/ssh_host_key"  #define _PATH_HOST_KEY_FILE             SSHDIR "/ssh_host_key"
 #define _PATH_HOST_DSA_KEY_FILE         ETCDIR "/ssh_host_dsa_key"  #define _PATH_HOST_DSA_KEY_FILE         SSHDIR "/ssh_host_dsa_key"
 #define _PATH_HOST_RSA_KEY_FILE         ETCDIR "/ssh_host_rsa_key"  #define _PATH_HOST_RSA_KEY_FILE         SSHDIR "/ssh_host_rsa_key"
 #define _PATH_DH_MODULI                 ETCDIR "/moduli"  #define _PATH_DH_MODULI                 ETCDIR "/moduli"
 /* Backwards compatibility */  /* Backwards compatibility */
 #define _PATH_DH_PRIMES                 ETCDIR "/primes"  #define _PATH_DH_PRIMES                 ETCDIR "/primes"
Line 95 
Line 96 
  * use.  xauth will be run if neither of these exists.   * use.  xauth will be run if neither of these exists.
  */   */
 #define _PATH_SSH_USER_RC               ".ssh/rc"  #define _PATH_SSH_USER_RC               ".ssh/rc"
 #define _PATH_SSH_SYSTEM_RC             ETCDIR "/sshrc"  #define _PATH_SSH_SYSTEM_RC             SSHDIR "/sshrc"
   
 /*  /*
  * Ssh-only version of /etc/hosts.equiv.  Additionally, the daemon may use   * Ssh-only version of /etc/hosts.equiv.  Additionally, the daemon may use
Line 111 
Line 112 
   
 /* xauth for X11 forwarding */  /* xauth for X11 forwarding */
 #define _PATH_XAUTH                     "/usr/X11R6/bin/xauth"  #define _PATH_XAUTH                     "/usr/X11R6/bin/xauth"
   
   /* UNIX domain socket for X11 server; displaynum will replace %u */
   #define _PATH_UNIX_X "/tmp/.X11-unix/X%u"
   
 /* for scp */  /* for scp */
 #define _PATH_CP                        "cp"  #define _PATH_CP                        "cp"

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.9.2.2