diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /servconf.h | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index bc0536927..fd72ce2a3 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.107 2013/01/03 05:49:36 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.109 2013/07/19 07:37:48 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -65,6 +65,7 @@ typedef struct { | |||
65 | int num_host_key_files; /* Number of files for host keys. */ | 65 | int num_host_key_files; /* Number of files for host keys. */ |
66 | char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */ | 66 | char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */ |
67 | int num_host_cert_files; /* Number of files for host certs. */ | 67 | int num_host_cert_files; /* Number of files for host certs. */ |
68 | char *host_key_agent; /* ssh-agent socket for host keys. */ | ||
68 | char *pid_file; /* Where to put our pid */ | 69 | char *pid_file; /* Where to put our pid */ |
69 | int server_key_bits;/* Size of the server key. */ | 70 | int server_key_bits;/* Size of the server key. */ |
70 | int login_grace_time; /* Disconnect if no auth in this time | 71 | int login_grace_time; /* Disconnect if no auth in this time |
@@ -180,6 +181,9 @@ typedef struct { | |||
180 | char *authorized_keys_command; | 181 | char *authorized_keys_command; |
181 | char *authorized_keys_command_user; | 182 | char *authorized_keys_command_user; |
182 | 183 | ||
184 | int64_t rekey_limit; | ||
185 | int rekey_interval; | ||
186 | |||
183 | char *version_addendum; /* Appended to SSH banner */ | 187 | char *version_addendum; /* Appended to SSH banner */ |
184 | 188 | ||
185 | u_int num_auth_methods; | 189 | u_int num_auth_methods; |