- markus@cvs.openbsd.org 2001/03/10 17:51:04

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index f3ebe359ec15c69cac6308d36ebb6a7fe8937b48..55babe80eadc87c9ccb6ff7807edad001641d94b 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,23 +1,23 @@
 /*
- *
- * readconf.h
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Sat Apr 22 00:25:29 1995 ylo
- *
  * Functions for reading the configuration file.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$Id$"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.28 2001/03/10 17:51:04 markus Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
 
+#include "key.h"
+
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
@@ -30,14 +30,16 @@ typedef struct {
 typedef struct {
        int     forward_agent;  /* Forward authentication agent. */
        int     forward_x11;    /* Forward X11 display. */
+       char   *xauth_location; /* Location for xauth program */
        int     gateway_ports;  /* Allow remote connects to forwarded ports. */
        int     use_privileged_port;    /* Don't use privileged port if false. */
        int     rhosts_authentication;  /* Try rhosts authentication. */
        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     challenge_reponse_authentication;
+                                       /* Try S/Key or TIS, authentication. */
 #ifdef KRB4
        int     kerberos_authentication;        /* Try Kerberos
                                                 * authentication. */
@@ -48,6 +50,8 @@ typedef struct {
 #endif
        int     password_authentication;        /* Try password
                                                 * authentication. */
+       int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+       char    *kbd_interactive_devices; /* Keyboard-interactive auth devices. */
        int     fallback_to_rsh;/* Use rsh if cannot connect with ssh. */
        int     use_rsh;        /* Always use rsh (don\'t try ssh). */
        int     batch_mode;     /* Batch mode: do not ask for passwords. */
@@ -65,9 +69,11 @@ typedef struct {
        int     number_of_password_prompts;     /* Max number of password
                                                 * prompts. */
        int     cipher;         /* Cipher to use. */
-       char   *ciphers;        /* Ciphers in order of preference. */
+       char   *ciphers;        /* SSH2 ciphers in order of preference. */
+       char   *macs;           /* SSH2 macs 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 */
@@ -76,11 +82,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;