diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-31 17:05:58 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-31 17:05:58 +1100 |
commit | c4bcc917519e55f449044e558228a2e11b80740c (patch) | |
tree | 5e3845766630739bd2acb2cfb040a79a555e2e69 | |
parent | 89e03bae5c7390019d66e1ff9a550b3b53150476 (diff) |
- (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 @@ | |||
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 | ||
26 | 20051229 | 27 | 20051229 |
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]) |