- (djm) OpenBSD CVS Sync

   - deraadt@cvs.openbsd.org 2002/02/09 17:37:34
     [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1]
     move ssh config files to /etc/ssh
 - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match

1 files changed, 15 insertions, 13 deletions

diff --git a/pathnames.h b/pathnames.h
index feb2d0cf8..002c313a5 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pathnames.h,v 1.10 2001/12/08 17:49:28 stevesk Exp $  */
+/*      $OpenBSD: pathnames.h,v 1.11 2002/02/09 17:37:34 deraadt Exp $  */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,8 +12,10 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-#ifndef ETCDIR
 #define ETCDIR                          "/etc"
+
+#ifndef SSHDIR
+#define SSHDIR                          ETCDIR "/ssh"
 #endif
 
 #ifndef _PATH_SSH_PIDDIR
@@ -24,22 +26,22 @@
  * 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_HOSTFILE       SSHDIR "/ssh_known_hosts"
 /* 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
  * 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_MODULI                 ETCDIR "/moduli"
+#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                 ETCDIR "/primes"
+#define _PATH_DH_PRIMES                 SSHDIR "/primes"
 
 #ifndef _PATH_SSH_PROGRAM
 #define _PATH_SSH_PROGRAM               "/usr/bin/ssh"
@@ -102,13 +104,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"
 
 /*