- jakob@cvs.openbsd.org 2001/08/02 16:14:05

[openssh.git] / pathnames.h

diff --git a/pathnames.h b/pathnames.h
index 223d5a2a6934b91f2d881801f5d3e6772904ad89..0470a21596a3060a5b433f35beedd392e11c6e48 100644 (file)
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: pathnames.h,v 1.9 2001/06/23 02:34:30 markus Exp $    */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -23,16 +25,20 @@
  * world-readable.
  */
 #define _PATH_SSH_SYSTEM_HOSTFILE      ETCDIR "/ssh_known_hosts"
+/* backward compat for protocol 2 */
 #define _PATH_SSH_SYSTEM_HOSTFILE2     ETCDIR "/ssh_known_hosts2"
 
 /*
  * Of these, ssh_host_key must be readable only by root, whereas ssh_config
  * should be world-readable.
  */
-#define _PATH_HOST_KEY_FILE            ETCDIR "/ssh_host_key"
 #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_MODULI                        ETCDIR "/moduli"
+/* Backwards compatibility */
 #define _PATH_DH_PRIMES                        ETCDIR "/primes"
 
 #ifndef _PATH_SSH_PROGRAM
@@ -57,6 +63,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"
 
 /*
@@ -84,6 +91,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"
 
 /*
@@ -109,11 +118,24 @@
 #define _PATH_SSH_ASKPASS_DEFAULT      "/usr/X11R6/bin/ssh-askpass"
 #endif
 
+/* xauth for X11 forwarding */
+#ifndef _PATH_XAUTH
+#define _PATH_XAUTH                    "/usr/X11R6/bin/xauth"
+#endif
+
 /* for scp */
 #ifndef _PATH_CP
 #define _PATH_CP                       "cp"
 #endif
 
+/* for sftp */
+#ifndef _PATH_SFTP_SERVER
+#define _PATH_SFTP_SERVER              "/usr/libexec/sftp-server"
+#endif
+#ifndef _PATH_LS
+#define _PATH_LS                       "ls"
+#endif
+
 /* path to login program */
 #ifndef LOGIN_PROGRAM
 # ifdef LOGIN_PROGRAM_FALLBACK
@@ -137,4 +159,3 @@
 #ifndef SSH_PRNG_COMMAND_FILE
 # define SSH_PRNG_COMMAND_FILE   ETCDIR "/ssh_prng_cmds"
 #endif /* SSH_PRNG_COMMAND_FILE */
-