diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
commit | efd3d4522636ae029488c2e9730b60c88e257d2e (patch) | |
tree | 31e02ac3f16090ce8c53448677356b2b7f423683 /servconf.h | |
parent | bbec4db36d464ea1d464a707625125f9fd5c7b5e (diff) | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) |
* New upstream release (LP: #535029).
- After a transition period of about 10 years, this release disables SSH
protocol 1 by default. Clients and servers that need to use the
legacy protocol must explicitly enable it in ssh_config / sshd_config
or on the command-line.
- Remove the libsectok/OpenSC-based smartcard code and add support for
PKCS#11 tokens. This support is enabled by default in the Debian
packaging, since it now doesn't involve additional library
dependencies (closes: #231472, LP: #16918).
- Add support for certificate authentication of users and hosts using a
new, minimal OpenSSH certificate format (closes: #482806).
- Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
- Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
package, this overlaps with the key blacklisting facility added in
openssh 1:4.7p1-9, but with different file formats and slightly
different scopes; for the moment, I've roughly merged the two.)
- Various multiplexing improvements, including support for requesting
port-forwardings via the multiplex protocol (closes: #360151).
- Allow setting an explicit umask on the sftp-server(8) commandline to
override whatever default the user has (closes: #496843).
- Many sftp client improvements, including tab-completion, more options,
and recursive transfer support for get/put (LP: #33378). The old
mget/mput commands never worked properly and have been removed
(closes: #270399, #428082).
- Do not prompt for a passphrase if we fail to open a keyfile, and log
the reason why the open failed to debug (closes: #431538).
- Prevent sftp from crashing when given a "-" without a command. Also,
allow whitespace to follow a "-" (closes: #531561).
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 0cd78bc22..4f20ad595 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.87 2009/01/22 10:02:34 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.92 2010/03/04 10:36:03 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -24,6 +24,7 @@ | |||
24 | #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ | 24 | #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ |
25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ | 25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ |
26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ | 26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ |
27 | #define MAX_HOSTCERTS 256 /* Max # host certificates. */ | ||
27 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ | 28 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ |
28 | #define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ | 29 | #define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ |
29 | 30 | ||
@@ -49,6 +50,8 @@ typedef struct { | |||
49 | int address_family; /* Address family used by the server. */ | 50 | int address_family; /* Address family used by the server. */ |
50 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ | 51 | char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ |
51 | int num_host_key_files; /* Number of files for host keys. */ | 52 | int num_host_key_files; /* Number of files for host keys. */ |
53 | char *host_cert_files[MAX_HOSTCERTS]; /* Files containing host certs. */ | ||
54 | int num_host_cert_files; /* Number of files for host certs. */ | ||
52 | char *pid_file; /* Where to put our pid */ | 55 | char *pid_file; /* Where to put our pid */ |
53 | int server_key_bits;/* Size of the server key. */ | 56 | int server_key_bits;/* Size of the server key. */ |
54 | int login_grace_time; /* Disconnect if no auth in this time | 57 | int login_grace_time; /* Disconnect if no auth in this time |
@@ -157,6 +160,8 @@ typedef struct { | |||
157 | int debian_banner; | 160 | int debian_banner; |
158 | 161 | ||
159 | char *chroot_directory; | 162 | char *chroot_directory; |
163 | char *revoked_keys_file; | ||
164 | char *trusted_user_ca_keys; | ||
160 | } ServerOptions; | 165 | } ServerOptions; |
161 | 166 | ||
162 | void initialize_server_options(ServerOptions *); | 167 | void initialize_server_options(ServerOptions *); |
@@ -170,5 +175,6 @@ void parse_server_match_config(ServerOptions *, const char *, const char *, | |||
170 | const char *); | 175 | const char *); |
171 | void copy_set_server_options(ServerOptions *, ServerOptions *, int); | 176 | void copy_set_server_options(ServerOptions *, ServerOptions *, int); |
172 | void dump_config(ServerOptions *); | 177 | void dump_config(ServerOptions *); |
178 | char *derelativise_path(const char *); | ||
173 | 179 | ||
174 | #endif /* SERVCONF_H */ | 180 | #endif /* SERVCONF_H */ |