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 /hostfile.c | |
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 'hostfile.c')
-rw-r--r-- | hostfile.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/hostfile.c b/hostfile.c index 3ed646247..2cceb352a 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: hostfile.c,v 1.45 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -36,18 +37,25 @@ | |||
36 | */ | 37 | */ |
37 | 38 | ||
38 | #include "includes.h" | 39 | #include "includes.h" |
39 | RCSID("$OpenBSD: hostfile.c,v 1.36 2005/11/22 03:36:03 dtucker Exp $"); | ||
40 | 40 | ||
41 | #include <resolv.h> | 41 | #include <sys/types.h> |
42 | |||
43 | #include <netinet/in.h> | ||
44 | |||
42 | #include <openssl/hmac.h> | 45 | #include <openssl/hmac.h> |
43 | #include <openssl/sha.h> | 46 | #include <openssl/sha.h> |
44 | 47 | ||
45 | #include "packet.h" | 48 | #include <resolv.h> |
49 | #include <stdarg.h> | ||
50 | #include <stdio.h> | ||
51 | #include <stdlib.h> | ||
52 | #include <string.h> | ||
53 | |||
54 | #include "xmalloc.h" | ||
46 | #include "match.h" | 55 | #include "match.h" |
47 | #include "key.h" | 56 | #include "key.h" |
48 | #include "hostfile.h" | 57 | #include "hostfile.h" |
49 | #include "log.h" | 58 | #include "log.h" |
50 | #include "xmalloc.h" | ||
51 | 59 | ||
52 | static int | 60 | static int |
53 | extract_salt(const char *s, u_int l, char *salt, size_t salt_len) | 61 | extract_salt(const char *s, u_int l, char *salt, size_t salt_len) |
@@ -254,8 +262,10 @@ check_host_in_hostfile_by_key_or_type(const char *filename, | |||
254 | 262 | ||
255 | if (key == NULL) { | 263 | if (key == NULL) { |
256 | /* we found a key of the requested type */ | 264 | /* we found a key of the requested type */ |
257 | if (found->type == keytype) | 265 | if (found->type == keytype) { |
266 | fclose(f); | ||
258 | return HOST_FOUND; | 267 | return HOST_FOUND; |
268 | } | ||
259 | continue; | 269 | continue; |
260 | } | 270 | } |
261 | 271 | ||