Skip to content

Commit 4783219

Browse files
committed
openssh: Use SSH_TUN_COMPAT_AF to fix tun device forwarding interoperability with other OSes.
See also: openssh/openssh-portable#588
1 parent 20f0996 commit 4783219

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

crypto/openssh/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@
18981898
#define SSH_PRIVSEP_USER "sshd"
18991899

19001900
/* Use tunnel device compatibility to OpenBSD */
1901-
/* #undef SSH_TUN_COMPAT_AF */
1901+
#define SSH_TUN_COMPAT_AF 1
19021902

19031903
/* Open tunnel devices the FreeBSD way */
19041904
#define SSH_TUN_FREEBSD 1

crypto/openssh/configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,8 @@ mips-sony-bsd|mips-sony-newsos4)
10591059
SKIP_DISABLE_LASTLOG_DEFINE=yes
10601060
AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)])
10611061
AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
1062+
AC_DEFINE([SSH_TUN_COMPAT_AF], [1],
1063+
[Use tunnel device compatibility to OpenBSD])
10621064
AC_CHECK_HEADER([net/if_tap.h], ,
10631065
AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
10641066
AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])

0 commit comments

Comments
 (0)