===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.h,v
retrieving revision 1.60.2.2
retrieving revision 1.61
diff -u -r1.60.2.2 -r1.61
--- src/usr.bin/ssh/readconf.h	2005/03/10 17:15:04	1.60.2.2
+++ src/usr.bin/ssh/readconf.h	2004/04/18 23:10:26	1.61
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readconf.h,v 1.60.2.2 2005/03/10 17:15:04 brad Exp $	*/
+/*	$OpenBSD: readconf.h,v 1.61 2004/04/18 23:10:26 djm Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -21,15 +21,12 @@
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
-	char	 *listen_host;		/* Host (address) to listen on. */
-	u_short	  listen_port;		/* Port to forward. */
-	char	 *connect_host;		/* Host to connect. */
-	u_short	  connect_port;		/* Port to connect on connect_host. */
+	u_short	  port;		/* Port to forward. */
+	char	 *host;		/* Host to connect. */
+	u_short	  host_port;	/* Port to connect on host. */
 }       Forward;
 /* Data structure for representing option data. */
 
-#define MAX_SEND_ENV	256
-
 typedef struct {
 	int     forward_agent;	/* Forward authentication agent. */
 	int     forward_x11;	/* Forward X11 display. */
@@ -104,28 +101,19 @@
 	int	rekey_limit;
 	int	no_host_authentication_for_localhost;
 	int	identities_only;
-	int	server_alive_interval;
+	int	server_alive_interval; 
 	int	server_alive_count_max;
-
-	int     num_send_env;
-	char   *send_env[MAX_SEND_ENV];
-
-	char	*control_path;
-	int	control_master;
-
-	int	hash_known_hosts;
 }       Options;
 
 
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int	 read_config_file(const char *, const char *, Options *, int);
-int	 parse_forward(Forward *, const char *);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);
 
-void	 add_local_forward(Options *, const Forward *);
-void	 add_remote_forward(Options *, const Forward *);
+void	 add_local_forward(Options *, u_short, const char *, u_short);
+void	 add_remote_forward(Options *, u_short, const char *, u_short);
 
 #endif				/* READCONF_H */