- (djm) CVS OpenBSD sync:

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 7a6dcc815ed6d632e5e80753317d8d229fdba5bd..23df57b4271fae4726390a73e5e7ae39b5be2816 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,19 +1,17 @@
 /*
- *
- * 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.21 2000/09/07 20:27:53 deraadt Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -30,12 +28,14 @@ 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. */
 #ifdef KRB4
        int     kerberos_authentication;        /* Try Kerberos
@@ -64,7 +64,7 @@ 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. */
        int     protocol;       /* Protocol in order of preference. */
        char   *hostname;       /* Real host to connect. */
        char   *proxy_command;  /* Proxy command for connecting the host. */