Merge 3.9p1 to the trunk.

1 files changed, 11 insertions, 3 deletions

diff --git a/readconf.h b/readconf.h
index 97b6c2be4..2f4908f4e 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readconf.h,v 1.60 2004/03/05 10:53:58 markus Exp $    */
+/*      $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -27,6 +27,8 @@ typedef struct {
 }       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. */
@@ -102,14 +104,20 @@ typedef struct {
         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;
 }       Options;
 
 
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
-int      read_config_file(const char *, const char *, Options *);
+int      read_config_file(const char *, const char *, Options *, int);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);