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 /monitor_wrap.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 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 8417b61f8..5920a90b2 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.14 2004/06/21 17:36:31 avsm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #ifndef _MM_WRAP_H_ | 28 | #ifndef _MM_WRAP_H_ |
29 | #define _MM_WRAP_H_ | 29 | #define _MM_WRAP_H_ |
30 | #include "key.h" | ||
31 | #include "buffer.h" | ||
32 | 30 | ||
33 | extern int use_privsep; | 31 | extern int use_privsep; |
34 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) | 32 | #define PRIVSEP(x) (use_privsep ? mm_##x : x) |
@@ -37,7 +35,6 @@ enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY} | |||
37 | 35 | ||
38 | struct monitor; | 36 | struct monitor; |
39 | struct mm_master; | 37 | struct mm_master; |
40 | struct passwd; | ||
41 | struct Authctxt; | 38 | struct Authctxt; |
42 | 39 | ||
43 | int mm_is_monitor(void); | 40 | int mm_is_monitor(void); |
@@ -58,7 +55,6 @@ int mm_auth_rsa_verify_response(Key *, BIGNUM *, u_char *); | |||
58 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); | 55 | BIGNUM *mm_auth_rsa_generate_challenge(Key *); |
59 | 56 | ||
60 | #ifdef GSSAPI | 57 | #ifdef GSSAPI |
61 | #include "ssh-gss.h" | ||
62 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 58 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
63 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, | 59 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, |
64 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); | 60 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
@@ -84,7 +80,7 @@ void mm_audit_run_command(const char *); | |||
84 | 80 | ||
85 | struct Session; | 81 | struct Session; |
86 | void mm_terminate(void); | 82 | void mm_terminate(void); |
87 | int mm_pty_allocate(int *, int *, char *, int); | 83 | int mm_pty_allocate(int *, int *, char *, size_t); |
88 | void mm_session_pty_cleanup2(struct Session *); | 84 | void mm_session_pty_cleanup2(struct Session *); |
89 | 85 | ||
90 | /* SSHv1 interfaces */ | 86 | /* SSHv1 interfaces */ |
@@ -113,4 +109,4 @@ void *mm_zalloc(struct mm_master *, u_int, u_int); | |||
113 | void mm_zfree(struct mm_master *, void *); | 109 | void mm_zfree(struct mm_master *, void *); |
114 | void mm_init_compression(struct mm_master *); | 110 | void mm_init_compression(struct mm_master *); |
115 | 111 | ||
116 | #endif /* _MM_H_ */ | 112 | #endif /* _MM_WRAP_H_ */ |