- (bal) renabled 'catman-do:' and fixed it. So now catman pages should

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index e94213fa1770c4ce9214f10082a69e17250ff930..9e943f905c520028276cc0236f9f7bab0f3cb1f5 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -11,11 +11,13 @@
  * 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.30 2001/04/17 10:53:25 markus Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
 
+#include "key.h"
+
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
@@ -35,8 +37,10 @@ typedef struct {
        int     rhosts_rsa_authentication;      /* Try rhosts with RSA
                                                 * authentication. */
        int     rsa_authentication;     /* Try RSA authentication. */
-       int     dsa_authentication;     /* Try DSA authentication. */
-       int     skey_authentication;    /* Try S/Key or TIS authentication. */
+       int     pubkey_authentication;  /* Try ssh2 pubkey authentication. */
+       int     hostbased_authentication;       /* ssh2's rhosts_rsa */
+       int     challenge_reponse_authentication;
+                                       /* Try S/Key or TIS, authentication. */
 #ifdef KRB4
        int     kerberos_authentication;        /* Try Kerberos
                                                 * authentication. */
@@ -67,8 +71,11 @@ typedef struct {
                                                 * prompts. */
        int     cipher;         /* Cipher to use. */
        char   *ciphers;        /* SSH2 ciphers in order of preference. */
+       char   *macs;           /* SSH2 macs in order of preference. */
+       char   *hostkeyalgorithms;      /* SSH2 server key types in order of preference. */
        int     protocol;       /* Protocol in order of preference. */
        char   *hostname;       /* Real host to connect. */
+       char   *host_key_alias; /* hostname alias for .ssh/known_hosts */
        char   *proxy_command;  /* Proxy command for connecting the host. */
        char   *user;           /* User to log in as. */
        int     escape_char;    /* Escape character; -2 = none */
@@ -77,11 +84,11 @@ typedef struct {
        char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */
        char   *system_hostfile2;
        char   *user_hostfile2;
+       char   *preferred_authentications;
 
-       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];
+       Key    *identity_keys[SSH_MAX_IDENTITY_FILES];
 
        /* Local TCP/IP forward requests. */
        int     num_local_forwards;