resolving conflicts from import of OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / readconf.h

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 6a3823b02b78e19d26f8d1fa376c6c0bb08067a8..78eb92a0fde983b45422c43b69deed12aa85b5f6 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/readconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: readconf.h,v 1.42 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * 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 $"); */
-
 #ifndef READCONF_H
 #define READCONF_H
 
@@ -90,7 +90,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;