diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
| commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
| tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /hostfile.c | |
| parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
| parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) | |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'hostfile.c')
| -rw-r--r-- | hostfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hostfile.c b/hostfile.c index bf2a31c9b..63550a29d 100644 --- a/hostfile.c +++ b/hostfile.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include "includes.h" | 38 | #include "includes.h" |
| 39 | RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $"); | 39 | RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $"); |
| 40 | 40 | ||
| 41 | #include <resolv.h> | 41 | #include <resolv.h> |
| 42 | #include <openssl/hmac.h> | 42 | #include <openssl/hmac.h> |
| @@ -315,7 +315,7 @@ add_host_to_hostfile(const char *filename, const char *host, const Key *key, | |||
| 315 | { | 315 | { |
| 316 | FILE *f; | 316 | FILE *f; |
| 317 | int success = 0; | 317 | int success = 0; |
| 318 | char *hashed_host; | 318 | char *hashed_host = NULL; |
| 319 | 319 | ||
| 320 | if (key == NULL) | 320 | if (key == NULL) |
| 321 | return 1; /* XXX ? */ | 321 | return 1; /* XXX ? */ |