diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /hostfile.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
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 | ||