- deraadt@cvs.openbsd.org 2002/02/10 01:07:05

     [readconf.h sshd.8]
     more /etc/ssh; openbsd@davidkrause.com

diff --git a/ChangeLog b/ChangeLog
index b5debad799632245faa2aa1d72204efee864f787..a1428c997b8a54f41b08bcc8093bfc833323ffe4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
      [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
+   - deraadt@cvs.openbsd.org 2002/02/10 01:07:05
+     [readconf.h sshd.8]
+     more /etc/ssh; openbsd@davidkrause.com
 
 20020208
  - (djm) OpenBSD CVS Sync

diff --git a/readconf.h b/readconf.h
index 25ffa4668b4f482ff70389e88640a98e84709e42..b1f01734d6a08c71cb6e17d7bbdf3fd7439744cd 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: readconf.h,v 1.40 2001/10/01 21:51:16 markus Exp $"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.41 2002/02/10 01:07:05 deraadt Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -81,7 +81,7 @@ typedef struct {
        char   *user;           /* User to log in as. */
        int     escape_char;    /* Escape character; -2 = none */
 
-       char   *system_hostfile;/* Path for /etc/ssh_known_hosts. */
+       char   *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */
        char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */
        char   *system_hostfile2;
        char   *user_hostfile2;

diff --git a/sshd.8 b/sshd.8
index ca024a565f6309370b9dbf16b591447ffab69b06..cf74109903bedb404806ecb3e27695dd56703c10 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.167 2002/02/09 17:37:34 deraadt Exp $
+.\" $OpenBSD: sshd.8,v 1.168 2002/02/10 01:07:05 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -966,7 +966,7 @@ Changes to user's home directory.
 If
 .Pa $HOME/.ssh/rc
 exists, runs it; else if
-.Pa /etc/sshrc
+.Pa /etc/ssh/sshrc
 exists, runs
 it; otherwise runs xauth.
 The