summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-24 11:40:32 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-24 11:40:32 +1100
commit1b118881b8f71a84458e42de07708c863f70093f (patch)
treebdf85e05075b2110b50187e215ee987f8758bf06
parente23a79cbed41a3d10533a9d5caefdcee058a066b (diff)
- (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2009/10/11 23:03:15 [hostfile.c] mention the host name that we are looking for in check_host_in_hostfile()
-rw-r--r--ChangeLog6
-rw-r--r--hostfile.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 918a48da1..16f45c8ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120091024
2 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2009/10/11 23:03:15
4 [hostfile.c]
5 mention the host name that we are looking for in check_host_in_hostfile()
6
120091011 720091011
2 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for 8 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
3 dirent d_type and DTTOIF as we've switched OpenBSD to the more portable 9 dirent d_type and DTTOIF as we've switched OpenBSD to the more portable
diff --git a/hostfile.c b/hostfile.c
index 2cceb352a..cd28bf446 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hostfile.c,v 1.45 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: hostfile.c,v 1.46 2009/10/11 23:03:15 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -204,7 +204,7 @@ check_host_in_hostfile_by_key_or_type(const char *filename,
204 char *cp, *cp2, *hashed_host; 204 char *cp, *cp2, *hashed_host;
205 HostStatus end_return; 205 HostStatus end_return;
206 206
207 debug3("check_host_in_hostfile: filename %s", filename); 207 debug3("check_host_in_hostfile: host %s filename %s", host, filename);
208 208
209 /* Open the file containing the list of known hosts. */ 209 /* Open the file containing the list of known hosts. */
210 f = fopen(filename, "r"); 210 f = fopen(filename, "r");