diff options
author | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
commit | 88c7c9558ba88abbcc00dcd9133b4996eff74033 (patch) | |
tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/hostfile.c | |
parent | 1ea3628aba1278f27d571a26380b4e91155d3973 (diff) | |
download | FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.zip FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/hostfile.c')
-rw-r--r-- | crypto/openssh/hostfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/hostfile.c b/crypto/openssh/hostfile.c index bf2a31c..63550a2 100644 --- a/crypto/openssh/hostfile.c +++ b/crypto/openssh/hostfile.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $"); +RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $"); #include <resolv.h> #include <openssl/hmac.h> @@ -315,7 +315,7 @@ add_host_to_hostfile(const char *filename, const char *host, const Key *key, { FILE *f; int success = 0; - char *hashed_host; + char *hashed_host = NULL; if (key == NULL) return 1; /* XXX ? */ |