diff options
| author | Damien Miller <djm@mindrot.org> | 2005-12-31 07:05:58 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-12-31 07:05:58 +0100 |
| commit | c4bcc917519e55f449044e558228a2e11b80740c (patch) | |
| tree | 5e3845766630739bd2acb2cfb040a79a555e2e69 | |
| parent | - (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does (diff) | |
| download | openssh-c4bcc917519e55f449044e558228a2e11b80740c.tar.xz openssh-c4bcc917519e55f449044e558228a2e11b80740c.zip | |
- (djm) [configure.ac] oops, make that linux/if_tun.h
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -22,6 +22,7 @@ compatability support for Linux, diff from reyk@ - (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does not exist + - (djm) [configure.ac] oops, make that linux/if_tun.h 20051229 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd @@ -3577,4 +3578,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.4058 2005/12/31 05:42:03 djm Exp $ +$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 @@ -# $Id: configure.ac,v 1.318 2005/12/31 05:42:03 djm Exp $ +# $Id: configure.ac,v 1.319 2005/12/31 06:05:58 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -327,7 +327,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) ;; esac # tun(4) forwarding compat code - AC_CHECK_HEADERS(linux/tun.h) + AC_CHECK_HEADERS(linux/if_tun.h) if test "x$ac_cv_header_linux_tun_h" = "xyes" ; then AC_DEFINE(SSH_TUN_LINUX, 1, [Open tunnel devices the Linux tun/tap way]) |