Import of OpenSSH 3.9p1

[gssapi-openssh.git] / openssh / readconf.h

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 93d833cee3dca68b753f5254d8793e80b85664f7..ded4225857bf75029d19d518d55e25388706e7d1 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/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. */
@@ -101,14 +103,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 *);