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 68e56b7a8..c8a23a2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
22 compatability support for Linux, diff from reyk@ 22 compatability support for Linux, diff from reyk@
23 - (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does 23 - (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does
24 not exist 24 not exist
25 - (djm) [configure.ac] oops, make that linux/if_tun.h
25 26
2620051229 2720051229
27 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd 28 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
@@ -3577,4 +3578,4 @@
3577 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3578 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3578 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3579 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3579 3580
3580$Id: ChangeLog,v 1.4058 2005/12/31 05:42:03 djm Exp $ 3581$Id: ChangeLog,v 1.4059 2005/12/31 06:05:58 djm Exp $
diff --git a/configure.ac b/configure.ac
index 3126cfcb0..26ed218d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.318 2005/12/31 05:42:03 djm Exp $ 1# $Id: configure.ac,v 1.319 2005/12/31 06:05:58 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -327,7 +327,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
327 ;; 327 ;;
328 esac 328 esac
329 # tun(4) forwarding compat code 329 # tun(4) forwarding compat code
330 AC_CHECK_HEADERS(linux/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_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])