- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 03b772a2d5dcf45c6f348af4eb99458ad3e4b2db..4565b2c2cedabd42cc95334be089295a45368135 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: readconf.h,v 1.65 2005/03/01 10:09:52 djm Exp $       */
+/*     $OpenBSD: readconf.h,v 1.68 2005/12/06 22:38:27 reyk Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -112,8 +112,23 @@ typedef struct {
 
        char    *control_path;
        int     control_master;
+
+       int     hash_known_hosts;
+
+       int     tun_open;       /* tun(4) */
+       int     tun_local;      /* force tun device (optional) */
+       int     tun_remote;     /* force tun device (optional) */
+
+       char    *local_command;
+       int     permit_local_command;
+
 }       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 *);