summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3081c80f3..3ad1c306d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
39 - stevesk@cvs.openbsd.org 2005/10/14 02:29:37 39 - stevesk@cvs.openbsd.org 2005/10/14 02:29:37
40 [channels.c clientloop.c] 40 [channels.c clientloop.c]
41 free()->xfree(); ok djm@ 41 free()->xfree(); ok djm@
42 - stevesk@cvs.openbsd.org 2005/10/15 15:28:12
43 [sshconnect.c]
44 make external definition static; ok deraadt@
42 45
4320051102 4620051102
44 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 47 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3172,4 +3175,4 @@
3172 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3175 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3173 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3176 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3174 3177
3175$Id: ChangeLog,v 1.3936 2005/11/05 04:07:59 djm Exp $ 3178$Id: ChangeLog,v 1.3937 2005/11/05 04:08:57 djm Exp $
diff --git a/sshconnect.c b/sshconnect.c
index ba7b9b71e..d8cfd35b3 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.168 2005/07/17 07:17:55 djm Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.169 2005/10/15 15:28:12 stevesk Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -31,13 +31,12 @@ RCSID("$OpenBSD: sshconnect.c,v 1.168 2005/07/17 07:17:55 djm Exp $");
31#include "readconf.h" 31#include "readconf.h"
32#include "atomicio.h" 32#include "atomicio.h"
33#include "misc.h" 33#include "misc.h"
34
35#include "dns.h" 34#include "dns.h"
36 35
37char *client_version_string = NULL; 36char *client_version_string = NULL;
38char *server_version_string = NULL; 37char *server_version_string = NULL;
39 38
40int matching_host_key_dns = 0; 39static int matching_host_key_dns = 0;
41 40
42/* import */ 41/* import */
43extern Options options; 42extern Options options;