diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
commit | 78799892cb1858927be02be9737c594052e3f910 (patch) | |
tree | ac3dc2e848ab9dc62fe4252e01e52c3d456f628f /readconf.h | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) | |
parent | 31e30b835fd9695d3b6647cab4867001b092e28f (diff) |
* New upstream release (http://www.openssh.com/txt/release-5.6):
- Added a ControlPersist option to ssh_config(5) that automatically
starts a background ssh(1) multiplex master when connecting. This
connection can stay alive indefinitely, or can be set to automatically
close after a user-specified duration of inactivity (closes: #335697,
#350898, #454787, #500573, #550262).
- Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
Match blocks (closes: #549858).
- sftp(1): fix ls in working directories that contain globbing
characters in their pathnames (LP: #530714).
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h index 24762e71c..cc341c9ba 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.82 2010/02/08 10:50:20 markus Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -23,6 +23,7 @@ typedef struct { | |||
23 | int listen_port; /* Port to forward. */ | 23 | int listen_port; /* Port to forward. */ |
24 | char *connect_host; /* Host to connect. */ | 24 | char *connect_host; /* Host to connect. */ |
25 | int connect_port; /* Port to connect on connect_host. */ | 25 | int connect_port; /* Port to connect on connect_host. */ |
26 | int allocated_port; /* Dynamically allocated listen port */ | ||
26 | } Forward; | 27 | } Forward; |
27 | /* Data structure for representing option data. */ | 28 | /* Data structure for representing option data. */ |
28 | 29 | ||
@@ -31,6 +32,7 @@ typedef struct { | |||
31 | typedef struct { | 32 | typedef struct { |
32 | int forward_agent; /* Forward authentication agent. */ | 33 | int forward_agent; /* Forward authentication agent. */ |
33 | int forward_x11; /* Forward X11 display. */ | 34 | int forward_x11; /* Forward X11 display. */ |
35 | int forward_x11_timeout; /* Expiration for Cookies */ | ||
34 | int forward_x11_trusted; /* Trust Forward X11 display. */ | 36 | int forward_x11_trusted; /* Trust Forward X11 display. */ |
35 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ | 37 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ |
36 | char *xauth_location; /* Location for xauth program */ | 38 | char *xauth_location; /* Location for xauth program */ |
@@ -98,11 +100,11 @@ typedef struct { | |||
98 | 100 | ||
99 | /* Local TCP/IP forward requests. */ | 101 | /* Local TCP/IP forward requests. */ |
100 | int num_local_forwards; | 102 | int num_local_forwards; |
101 | Forward local_forwards[SSH_MAX_FORWARDS_PER_DIRECTION]; | 103 | Forward *local_forwards; |
102 | 104 | ||
103 | /* Remote TCP/IP forward requests. */ | 105 | /* Remote TCP/IP forward requests. */ |
104 | int num_remote_forwards; | 106 | int num_remote_forwards; |
105 | Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION]; | 107 | Forward *remote_forwards; |
106 | int clear_forwardings; | 108 | int clear_forwardings; |
107 | 109 | ||
108 | int enable_ssh_keysign; | 110 | int enable_ssh_keysign; |
@@ -117,6 +119,8 @@ typedef struct { | |||
117 | 119 | ||
118 | char *control_path; | 120 | char *control_path; |
119 | int control_master; | 121 | int control_master; |
122 | int control_persist; /* ControlPersist flag */ | ||
123 | int control_persist_timeout; /* ControlPersist timeout (seconds) */ | ||
120 | 124 | ||
121 | int hash_known_hosts; | 125 | int hash_known_hosts; |
122 | 126 | ||