diff --git a/ChangeLog b/ChangeLog index de0835431..c38fd0ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ for tunnel forwarding for FreeBSD and NetBSD. NetBSD's support is limited to IPv4 tunnels only, and most versions don't support the tap(4) device at all. + - (djm) [configure.ac] Fix linux/if_tun.h test 20051229 - (djm) OpenBSD CVS Sync @@ -3585,4 +3586,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.4060 2006/01/01 08:47:05 djm Exp $ +$Id: ChangeLog,v 1.4061 2006/01/01 10:03:30 djm Exp $ diff --git a/configure.ac b/configure.ac index 2f5906667..a9654cbde 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.320 2006/01/01 08:47:05 djm Exp $ +# $Id: configure.ac,v 1.321 2006/01/01 10:03:30 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -328,7 +328,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) esac # tun(4) forwarding compat code AC_CHECK_HEADERS(linux/if_tun.h) - if test "x$ac_cv_header_linux_tun_h" = "xyes" ; then + if test "x$ac_cv_header_linux_if_tun_h" = "xyes" ; then AC_DEFINE(SSH_TUN_LINUX, 1, [Open tunnel devices the Linux tun/tap way]) AC_DEFINE(SSH_TUN_COMPAT_AF, 1,