diff options
Diffstat (limited to 'crypto/openssh/pathnames.h')
| -rw-r--r-- | crypto/openssh/pathnames.h | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/crypto/openssh/pathnames.h b/crypto/openssh/pathnames.h index 0b0f2d3..8dde2a3 100644 --- a/crypto/openssh/pathnames.h +++ b/crypto/openssh/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.5 2001/04/12 19:15:24 markus Exp $ */ +/* $OpenBSD: pathnames.h,v 1.11 2002/02/09 17:37:34 deraadt Exp $ */ /* $FreeBSD$ */ /* @@ -13,26 +13,30 @@ * called by a name other than "ssh" or "Secure Shell". */ -#define ETCDIR "/etc/ssh" +#define ETCDIR "/etc" +#define SSHDIR ETCDIR "/ssh" #define _PATH_SSH_PIDDIR "/var/run" /* * System-wide file containing host keys of known hosts. This file should be * world-readable. */ -#define _PATH_SSH_SYSTEM_HOSTFILE ETCDIR "/ssh_known_hosts" -#define _PATH_SSH_SYSTEM_HOSTFILE2 ETCDIR "/ssh_known_hosts2" +#define _PATH_SSH_SYSTEM_HOSTFILE SSHDIR "/ssh_known_hosts" +/* backward compat for protocol 2 */ +#define _PATH_SSH_SYSTEM_HOSTFILE2 SSHDIR "/ssh_known_hosts2" /* * Of these, ssh_host_key must be readable only by root, whereas ssh_config * should be world-readable. */ -#define _PATH_SERVER_CONFIG_FILE ETCDIR "/sshd_config" -#define _PATH_HOST_CONFIG_FILE ETCDIR "/ssh_config" -#define _PATH_HOST_KEY_FILE ETCDIR "/ssh_host_key" -#define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" -#define _PATH_HOST_RSA_KEY_FILE ETCDIR "/ssh_host_rsa_key" -#define _PATH_DH_PRIMES ETCDIR "/primes" +#define _PATH_SERVER_CONFIG_FILE SSHDIR "/sshd_config" +#define _PATH_HOST_CONFIG_FILE SSHDIR "/ssh_config" +#define _PATH_HOST_KEY_FILE SSHDIR "/ssh_host_key" +#define _PATH_HOST_DSA_KEY_FILE SSHDIR "/ssh_host_dsa_key" +#define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key" +#define _PATH_DH_MODULI SSHDIR "/moduli" +/* Backwards compatibility */ +#define _PATH_DH_PRIMES SSHDIR "/primes" #define _PATH_SSH_PROGRAM "/usr/bin/ssh" @@ -54,6 +58,7 @@ * contain anything particularly secret. */ #define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" +/* backward compat for protocol 2 */ #define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" /* @@ -81,6 +86,8 @@ * running as root.) */ #define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" + +/* backward compat for protocol v2 */ #define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" /* @@ -90,13 +97,13 @@ * use. xauth will be run if neither of these exists. */ #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 * ~/.rhosts and /etc/hosts.equiv if rhosts authentication is enabled. */ -#define _PATH_SSH_HOSTS_EQUIV ETCDIR "/shosts.equiv" +#define _PATH_SSH_HOSTS_EQUIV SSHDIR "/shosts.equiv" #define _PATH_RHOSTS_EQUIV "/etc/hosts.equiv" /* @@ -104,6 +111,12 @@ */ #define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" +/* xauth for X11 forwarding */ +#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 */ #define _PATH_CP "cp" |
