diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /readconf.h | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/readconf.h b/readconf.h index 4639a74a4..a7d9200b5 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.68 2005/12/06 22:38:27 reyk Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.71 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,8 +16,6 @@ | |||
16 | #ifndef READCONF_H | 16 | #ifndef READCONF_H |
17 | #define READCONF_H | 17 | #define READCONF_H |
18 | 18 | ||
19 | #include "key.h" | ||
20 | |||
21 | /* Data structure for representing a forwarding request. */ | 19 | /* Data structure for representing a forwarding request. */ |
22 | 20 | ||
23 | typedef struct { | 21 | typedef struct { |
@@ -34,6 +32,7 @@ typedef struct { | |||
34 | int forward_agent; /* Forward authentication agent. */ | 32 | int forward_agent; /* Forward authentication agent. */ |
35 | int forward_x11; /* Forward X11 display. */ | 33 | int forward_x11; /* Forward X11 display. */ |
36 | int forward_x11_trusted; /* Trust Forward X11 display. */ | 34 | int forward_x11_trusted; /* Trust Forward X11 display. */ |
35 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ | ||
37 | char *xauth_location; /* Location for xauth program */ | 36 | char *xauth_location; /* Location for xauth program */ |
38 | int gateway_ports; /* Allow remote connects to forwarded ports. */ | 37 | int gateway_ports; /* Allow remote connects to forwarded ports. */ |
39 | int use_privileged_port; /* Don't use privileged port if false. */ | 38 | int use_privileged_port; /* Don't use privileged port if false. */ |
@@ -45,6 +44,7 @@ typedef struct { | |||
45 | int challenge_response_authentication; | 44 | int challenge_response_authentication; |
46 | /* Try S/Key or TIS, authentication. */ | 45 | /* Try S/Key or TIS, authentication. */ |
47 | int gss_authentication; /* Try GSS authentication */ | 46 | int gss_authentication; /* Try GSS authentication */ |
47 | int gss_keyex; /* Try GSS key exchange */ | ||
48 | int gss_deleg_creds; /* Delegate GSS credentials */ | 48 | int gss_deleg_creds; /* Delegate GSS credentials */ |
49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ | 49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ |
50 | int password_authentication; /* Try password | 50 | int password_authentication; /* Try password |
@@ -58,7 +58,7 @@ typedef struct { | |||
58 | int compression_level; /* Compression level 1 (fast) to 9 | 58 | int compression_level; /* Compression level 1 (fast) to 9 |
59 | * (best). */ | 59 | * (best). */ |
60 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ | 60 | int tcp_keep_alive; /* Set SO_KEEPALIVE. */ |
61 | int setuptimeout; /* timeout in the protocol banner exchange */ | 61 | int setuptimeout; /* timeout in the protocol banner exchange */ |
62 | LogLevel log_level; /* Level for logging. */ | 62 | LogLevel log_level; /* Level for logging. */ |
63 | 63 | ||
64 | int port; /* Port to connect. */ | 64 | int port; /* Port to connect. */ |