summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--includes.h2
-rw-r--r--misc.c6
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a1f0b7842..73203f24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
14 - jmc@cvs.openbsd.org 2005/12/31 13:45:19 14 - jmc@cvs.openbsd.org 2005/12/31 13:45:19
15 [ssh.1] 15 [ssh.1]
16 .Nm does not require an argument; 16 .Nm does not require an argument;
17 - stevesk@cvs.openbsd.org 2006/01/01 08:59:27
18 [includes.h misc.c]
19 move <net/if.h>; ok djm@
17 20
1820060101 2120060101
19 - (djm) [Makefile.in configure.ac includes.h misc.c] 22 - (djm) [Makefile.in configure.ac includes.h misc.c]
@@ -3604,4 +3607,4 @@
3604 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3607 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3605 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3608 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3606 3609
3607$Id: ChangeLog,v 1.4066 2006/01/02 12:38:37 djm Exp $ 3610$Id: ChangeLog,v 1.4067 2006/01/02 12:40:10 djm Exp $
diff --git a/includes.h b/includes.h
index 808d5dc9a..520817400 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.21 2005/12/08 18:34:11 reyk Exp $ */ 1/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/misc.c b/misc.c
index 76dbf40ea..ac939af7e 100644
--- a/misc.c
+++ b/misc.c
@@ -24,7 +24,11 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: misc.c,v 1.37 2005/12/08 18:34:11 reyk Exp $"); 27RCSID("$OpenBSD: misc.c,v 1.38 2006/01/01 08:59:27 stevesk Exp $");
28
29#ifdef SSH_TUN_OPENBSD
30#include <net/if.h>
31#endif
28 32
29#include "misc.h" 33#include "misc.h"
30#include "log.h" 34#include "log.h"