- (djm) Fix a few warnings the above turned up

[openssh.git] / pathnames.h

diff --git a/pathnames.h b/pathnames.h
index 85d8a1fe2388da468970430437e2a490a81c7ad1..54c2c131972232f0e81b1731df0bca587eebd1bd 100644 (file)
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pathnames.h,v 1.2 2001/01/29 01:58:17 niklas Exp $    */
+/*     $OpenBSD: pathnames.h,v 1.9 2001/06/23 02:34:30 markus Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -25,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
@@ -59,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"
 
 /*
@@ -86,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"
 
 /*
@@ -116,6 +123,14 @@
 #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