Resolve conflicts and update for FreeBSD.

1 files changed, 18 insertions, 11 deletions

diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h
index 5d511aa..d7f44be 100644
--- a/crypto/openssh/readconf.h
+++ b/crypto/openssh/readconf.h
@@ -1,20 +1,20 @@
 /*
- * 
+ *
  * 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.
- * 
+ *
  * $FreeBSD$
  */
 
-/* RCSID("$Id: readconf.h,v 1.13 1999/12/01 13:59:15 markus Exp $"); */
+/* RCSID("$Id: readconf.h,v 1.18 2000/05/08 17:12:15 markus Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -37,6 +37,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     skey_authentication;	/* Try S/Key or TIS authentication. */
 #ifdef KRB4
 	int     krb4_authentication;		/* Try Kerberos v4
@@ -71,6 +72,8 @@ typedef struct {
 	int     number_of_password_prompts;	/* Max number of password
 						 * prompts. */
 	int     cipher;		/* Cipher to use. */
+	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. */
 	char   *user;		/* User to log in as. */
@@ -78,9 +81,13 @@ typedef struct {
 
 	char   *system_hostfile;/* Path for /etc/ssh_known_hosts. */
 	char   *user_hostfile;	/* Path for $HOME/.ssh/known_hosts. */
+	char   *system_hostfile2;
+	char   *user_hostfile2;
 
 	int     num_identity_files;	/* Number of files for RSA identities. */
+	int     num_identity_files2;	/* DSA identities. */
 	char   *identity_files[SSH_MAX_IDENTITY_FILES];
+	char   *identity_files2[SSH_MAX_IDENTITY_FILES];
 
 	/* Local TCP/IP forward requests. */
 	int     num_local_forwards;
@@ -111,7 +118,7 @@ void    fill_default_options(Options * options);
  * only sets those values that have not already been set. Returns 0 for legal
  * options
  */
-int 
+int
 process_config_line(Options * options, const char *host,
     char *line, const char *filename, int linenum,
     int *activep);
@@ -121,7 +128,7 @@ process_config_line(Options * options, const char *host,
  * should already be initialized before this call.  This never returns if
  * there is an error.  If the file does not exist, this returns immediately.
  */
-void 
+void
 read_config_file(const char *filename, const char *host,
     Options * options);
 
@@ -129,7 +136,7 @@ read_config_file(const char *filename, const char *host,
  * Adds a local TCP/IP port forward to options.  Never returns if there is an
  * error.
  */
-void 
+void
 add_local_forward(Options * options, u_short port, const char *host,
     u_short host_port);
 
@@ -137,7 +144,7 @@ add_local_forward(Options * options, u_short port, const char *host,
  * Adds a remote TCP/IP port forward to options.  Never returns if there is
  * an error.
  */
-void 
+void
 add_remote_forward(Options * options, u_short port, const char *host,
     u_short host_port);