- (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 93d833cee3dca68b753f5254d8793e80b85664f7..2b9deb9db393cd9c427c74a88913b86a15aacdb7 100644 (file)
--- 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.67 2005/06/08 11:25:09 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -21,12 +21,15 @@
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
-       u_short   port;         /* Port to forward. */
-       char     *host;         /* Host to connect. */
-       u_short   host_port;    /* Port to connect on host. */
+       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. */
 }       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,19 +104,33 @@ 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;
+
+       int     hash_known_hosts;
 }       Options;
 
+#define SSHCTL_MASTER_NO       0
+#define SSHCTL_MASTER_YES      1
+#define SSHCTL_MASTER_AUTO     2
+#define SSHCTL_MASTER_ASK      3
+#define SSHCTL_MASTER_AUTO_ASK 4
 
 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     parse_forward(Forward *, const char *);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);
 
-void    add_local_forward(Options *, u_short, const char *, u_short);
-void    add_remote_forward(Options *, u_short, const char *, u_short);
+void    add_local_forward(Options *, const Forward *);
+void    add_remote_forward(Options *, const Forward *);
 
 #endif                         /* READCONF_H */