summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index de0835431..c38fd0ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 for tunnel forwarding for FreeBSD and NetBSD. NetBSD's support is 4 for tunnel forwarding for FreeBSD and NetBSD. NetBSD's support is
5 limited to IPv4 tunnels only, and most versions don't support the 5 limited to IPv4 tunnels only, and most versions don't support the
6 tap(4) device at all. 6 tap(4) device at all.
7 - (djm) [configure.ac] Fix linux/if_tun.h test
7 8
820051229 920051229
9 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
@@ -3585,4 +3586,4 @@
3585 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3586 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3586 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3587 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3587 3588
3588$Id: ChangeLog,v 1.4060 2006/01/01 08:47:05 djm Exp $ 3589$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 @@
1# $Id: configure.ac,v 1.320 2006/01/01 08:47:05 djm Exp $ 1# $Id: configure.ac,v 1.321 2006/01/01 10:03:30 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -328,7 +328,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
328 esac 328 esac
329 # tun(4) forwarding compat code 329 # tun(4) forwarding compat code
330 AC_CHECK_HEADERS(linux/if_tun.h) 330 AC_CHECK_HEADERS(linux/if_tun.h)
331 if test "x$ac_cv_header_linux_tun_h" = "xyes" ; then 331 if test "x$ac_cv_header_linux_if_tun_h" = "xyes" ; then
332 AC_DEFINE(SSH_TUN_LINUX, 1, 332 AC_DEFINE(SSH_TUN_LINUX, 1,
333 [Open tunnel devices the Linux tun/tap way]) 333 [Open tunnel devices the Linux tun/tap way])
334 AC_DEFINE(SSH_TUN_COMPAT_AF, 1, 334 AC_DEFINE(SSH_TUN_COMPAT_AF, 1,