tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 19:08:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does

Browse Source 
not exist
This commit is contained in:
Damien Miller 2005-12-31 16:42:03 +11:00
parent 598bbc2d8f
commit 89e03bae5c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -20,6 +20,8 @@
[serverloop.c ssh.c openbsd-compat/Makefile.in] [serverloop.c ssh.c openbsd-compat/Makefile.in]
[openbsd-compat/openbsd-compat.h] Implement tun(4) forwarding [openbsd-compat/openbsd-compat.h] Implement tun(4) forwarding
compatability support for Linux, diff from reyk@ compatability support for Linux, diff from reyk@
- (djm) [configure.ac] Disable Linux tun(4) compat code if linux/tun.h does
not exist
20051229 20051229
- (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
@ -3575,4 +3577,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4057 2005/12/31 05:33:36 djm Exp $ $Id: ChangeLog,v 1.4058 2005/12/31 05:42:03 djm Exp $

15
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.317 2005/12/31 05:33:37 djm Exp $ # $Id: configure.ac,v 1.318 2005/12/31 05:42:03 djm Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -326,9 +326,16 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
[Define if cmsg_type is not passed correctly]) [Define if cmsg_type is not passed correctly])
;; ;;
esac esac
AC_DEFINE(SSH_TUN_LINUX, 1, [Open tunnel devices the Linux tun/tap way]) # tun(4) forwarding compat code
AC_DEFINE(SSH_TUN_COMPAT_AF, 1, [Use tunnel device compatibility to OpenBSD]) AC_CHECK_HEADERS(linux/tun.h)
AC_DEFINE(SSH_TUN_PREPEND_AF, 1, [Prepend the address family to IP tunnel traffic]) 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])
AC_DEFINE(SSH_TUN_COMPAT_AF, 1,
[Use tunnel device compatibility to OpenBSD])
AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
[Prepend the address family to IP tunnel traffic])
fi
;; ;;
mips-sony-bsd|mips-sony-newsos4) mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(NEED_SETPRGP, 1, [Need setpgrp to acquire controlling tty]) AC_DEFINE(NEED_SETPRGP, 1, [Need setpgrp to acquire controlling tty])