diff --git a/ChangeLog b/ChangeLog index a1f0b7842..73203f24f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ - jmc@cvs.openbsd.org 2005/12/31 13:45:19 [ssh.1] .Nm does not require an argument; + - stevesk@cvs.openbsd.org 2006/01/01 08:59:27 + [includes.h misc.c] + move ; ok djm@ 20060101 - (djm) [Makefile.in configure.ac includes.h misc.c] @@ -3604,4 +3607,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4066 2006/01/02 12:38:37 djm Exp $ +$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 @@ -/* $OpenBSD: includes.h,v 1.21 2005/12/08 18:34:11 reyk Exp $ */ +/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */ /* * Author: Tatu Ylonen diff --git a/misc.c b/misc.c index 76dbf40ea..ac939af7e 100644 --- a/misc.c +++ b/misc.c @@ -24,7 +24,11 @@ */ #include "includes.h" -RCSID("$OpenBSD: misc.c,v 1.37 2005/12/08 18:34:11 reyk Exp $"); +RCSID("$OpenBSD: misc.c,v 1.38 2006/01/01 08:59:27 stevesk Exp $"); + +#ifdef SSH_TUN_OPENBSD +#include +#endif #include "misc.h" #include "log.h"