merge 5.6p1

1 files changed, 7 insertions, 3 deletions

diff --git a/readconf.h b/readconf.h
index fd31bd40f..f81eaff47 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.82 2010/02/08 10:50:20 markus Exp $ */
+/* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,6 +23,7 @@ typedef struct {
         int       listen_port;          /* Port to forward. */
         char     *connect_host;         /* Host to connect. */
         int       connect_port;         /* Port to connect on connect_host. */
+        int       allocated_port;       /* Dynamically allocated listen port */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -31,6 +32,7 @@ typedef struct {
 typedef struct {
         int     forward_agent;  /* Forward authentication agent. */
         int     forward_x11;    /* Forward X11 display. */
+        int     forward_x11_timeout;    /* Expiration for Cookies */
         int     forward_x11_trusted;    /* Trust Forward X11 display. */
         int     exit_on_forward_failure;        /* Exit if bind(2) fails for -L/-R */
         char   *xauth_location; /* Location for xauth program */
@@ -97,11 +99,11 @@ typedef struct {
 
         /* Local TCP/IP forward requests. */
         int     num_local_forwards;
-        Forward local_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
+        Forward *local_forwards;
 
         /* Remote TCP/IP forward requests. */
         int     num_remote_forwards;
-        Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
+        Forward *remote_forwards;
         int     clear_forwardings;
 
         int     enable_ssh_keysign;
@@ -116,6 +118,8 @@ typedef struct {
 
         char    *control_path;
         int     control_master;
+        int     control_persist; /* ControlPersist flag */
+        int     control_persist_timeout; /* ControlPersist timeout (seconds) */
 
         int     hash_known_hosts;