mirror of git://anongit.mindrot.org/openssh.git
- (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
tunnel support for Mac OS X/Darwin via a third-party tun driver. Patch from reyk@, tested by anil@
This commit is contained in:
Darren Tucker
parent
643460803f
commit
3eb4834489
|
|
@ -1,3 +1,8 @@
|
|||
20060623
|
||||
- (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
|
||||
tunnel support for Mac OS X/Darwin via a third-party tun driver. Patch
|
||||
from reyk@, tested by anil@
|
||||
|
||||
20060613
|
||||
- (djm) [getput.h] This file has been replaced by functions in misc.c
|
||||
- OpenBSD CVS Sync
|
||||
|
|
@ -4685,4 +4690,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.4344 2006/06/13 03:15:54 djm Exp $
|
||||
$Id: ChangeLog,v 1.4345 2006/06/23 11:05:12 dtucker Exp $
|
||||
|
|
|
|||
12
INSTALL
12
INSTALL
|
|
@ -57,9 +57,10 @@ installed. No other S/Key library is currently known to be supported.
|
|||
http://www.sparc.spb.su/solaris/skey/
|
||||
|
||||
LibEdit:
|
||||
sftp now supports command-line editing via NetBSD's libedit. If your
|
||||
platform has it available natively you can use that, alternatively
|
||||
you might try these multi-platform ports:
|
||||
|
||||
sftp supports command-line editing via NetBSD's libedit. If your platform
|
||||
has it available natively you can use that, alternatively you might try
|
||||
these multi-platform ports:
|
||||
|
||||
http://www.thrysoee.dk/editline/
|
||||
http://sourceforge.net/projects/libedit/
|
||||
|
|
@ -210,7 +211,8 @@ for sshd, ssh and ssh-agent.
|
|||
-------------------------
|
||||
|
||||
$ make survey
|
||||
[check the contents and make sure there's no sensitive information]
|
||||
[check the contents of the file "survey" to ensure there's no information
|
||||
that you consider sensitive]
|
||||
$ make send-survey
|
||||
|
||||
This will send configuration information for the currently configured
|
||||
|
|
@ -227,4 +229,4 @@ Please refer to the "reporting bugs" section of the webpage at
|
|||
http://www.openssh.com/
|
||||
|
||||
|
||||
$Id: INSTALL,v 1.71 2006/02/20 09:17:36 dtucker Exp $
|
||||
$Id: INSTALL,v 1.72 2006/06/23 11:05:13 dtucker Exp $
|
||||
|
|
|
|||
|
|
@ -30,6 +30,18 @@ gcc, gcc-mingw-core, mingw-runtime, binutils, make, openssl,
|
|||
openssl-devel, zlib, minres, minires-devel.
|
||||
|
||||
|
||||
Darwin and MacOS X
|
||||
------------------
|
||||
Darwin does not provide a tun(4) driver required for OpenSSH-based
|
||||
virtual private networks. The BSD manpage still exists, but the driver
|
||||
has been removed in recent releases of Darwin and MacOS X.
|
||||
|
||||
Nevertheless, tunnel support is known to work with Darwin 8 and
|
||||
MacOS X 10.4 in Point-to-Point (Layer 3) and Ethernet (Layer 2) mode
|
||||
using a third party driver. More information is available at:
|
||||
http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
|
||||
|
||||
|
||||
Solaris
|
||||
-------
|
||||
If you enable BSM auditing on Solaris, you need to update audit_event(4)
|
||||
|
|
@ -55,4 +67,4 @@ account stacks which will prevent authentication entirely, but will still
|
|||
return the output from pam_nologin to the client.
|
||||
|
||||
|
||||
$Id: README.platform,v 1.6 2005/11/05 05:28:35 dtucker Exp $
|
||||
$Id: README.platform,v 1.7 2006/06/23 11:05:13 dtucker Exp $
|
||||
|
|
|
|||
10
configure.ac
10
configure.ac
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.339 2006/04/22 11:26:08 djm Exp $
|
||||
# $Id: configure.ac,v 1.340 2006/06/23 11:05:13 dtucker Exp $
|
||||
#
|
||||
# Copyright (c) 1999-2004 Damien Miller
|
||||
#
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
|
||||
AC_REVISION($Revision: 1.339 $)
|
||||
AC_REVISION($Revision: 1.340 $)
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
|
@ -231,6 +231,11 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
|
|||
AC_DEFINE(BROKEN_SETREGID)
|
||||
AC_DEFINE_UNQUOTED(BIND_8_COMPAT, 1,
|
||||
[Define if your resolver libs need this for getrrsetbyname])
|
||||
AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD 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])
|
||||
;;
|
||||
*-*-hpux*)
|
||||
# first we define all of the options common to all HP-UX releases
|
||||
|
|
@ -682,6 +687,7 @@ AC_CHECK_HEADERS( \
|
|||
login.h \
|
||||
maillock.h \
|
||||
ndir.h \
|
||||
net/if_tun.h \
|
||||
netdb.h \
|
||||
netgroup.h \
|
||||
pam/pam_appl.h \
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
* settings.
|
||||
*
|
||||
* SSH_TUN_LINUX Use the (newer) Linux tun/tap device
|
||||
* SSH_TUN_FREEBSD Use the FreeBSD tun/tap device
|
||||
* SSH_TUN_COMPAT_AF Translate the OpenBSD address family
|
||||
* SSH_TUN_PREPEND_AF Prepend/remove the address family
|
||||
*/
|
||||
|
|
@ -96,7 +97,10 @@ sys_tun_open(int tun, int mode)
|
|||
#ifdef SSH_TUN_FREEBSD
|
||||
#include <sys/socket.h>
|
||||
#include <net/if.h>
|
||||
|
||||
#ifdef HAVE_NET_IF_TUN_H
|
||||
#include <net/if_tun.h>
|
||||
#endif
|
||||
|
||||
int
|
||||
sys_tun_open(int tun, int mode)
|
||||
|
|
|
|||
Loading…
Reference in New Issue