- (djm) Merge OpenBSD changes:

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index e94213fa1770c4ce9214f10082a69e17250ff930..85d937d8716b8359877394f0bfe72f19579db2d9 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.22 2000/10/11 20:14:39 markus Exp $"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.23 2000/11/12 19:50:37 markus Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -35,7 +35,7 @@ typedef struct {
        int     rhosts_rsa_authentication;      /* Try rhosts with RSA
                                                 * authentication. */
        int     rsa_authentication;     /* Try RSA authentication. */
-       int     dsa_authentication;     /* Try DSA authentication. */
+       int     pubkey_authentication;  /* Try ssh2 pubkey authentication. */
        int     skey_authentication;    /* Try S/Key or TIS authentication. */
 #ifdef KRB4
        int     kerberos_authentication;        /* Try Kerberos
@@ -78,10 +78,9 @@ typedef struct {
        char   *system_hostfile2;
        char   *user_hostfile2;
 
-       int     num_identity_files;     /* Number of files for RSA identities. */
-       int     num_identity_files2;    /* DSA identities. */
+       int     num_identity_files;     /* Number of files for RSA/DSA identities. */
        char   *identity_files[SSH_MAX_IDENTITY_FILES];
-       char   *identity_files2[SSH_MAX_IDENTITY_FILES];
+       int     identity_files_type[SSH_MAX_IDENTITY_FILES];
 
        /* Local TCP/IP forward requests. */
        int     num_local_forwards;