summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-01-23 13:14:39 +0100
committerDarren Tucker <dtucker@zip.com.au>2014-01-23 13:14:39 +0100
commit42a092530159637da9cb7f9e1b5f4679e34a85e6 (patch)
tree6769e47527db4137a8c7efea3595b0d441bcd056 /configure.ac
parent - (tim) [session.c] Improve error reporting on set_id(). (diff)
downloadopenssh-42a092530159637da9cb7f9e1b5f4679e34a85e6.tar.xz
openssh-42a092530159637da9cb7f9e1b5f4679e34a85e6.zip
- (dtucker) [configure.ac] NetBSD's (and FreeBSD's) strnvis is gratuitously
incompatible with OpenBSD's despite post-dating it by more than a decade. Declare it as broken, and document FreeBSD's as the same. ok djm@
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 12d62e294..736f65027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.558 2014/01/22 10:30:13 djm Exp $
+# $Id: configure.ac,v 1.559 2014/01/23 12:14:40 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.558 $)
+AC_REVISION($Revision: 1.559 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -769,6 +769,8 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
[Prepend the address family to IP tunnel traffic])
TEST_MALLOC_OPTIONS="AJRX"
+ AC_DEFINE([BROKEN_STRNVIS], [1],
+ [NetBSD strnvis argument order is swapped compared to OpenBSD])
;;
*-*-freebsd*)
check_for_libcrypt_later=1
@@ -777,7 +779,8 @@ mips-sony-bsd|mips-sony-newsos4)
AC_CHECK_HEADER([net/if_tap.h], ,
AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])
- AC_DEFINE([BROKEN_STRNVIS], [1], [FreeBSD strnvis does not do what we need])
+ AC_DEFINE([BROKEN_STRNVIS], [1],
+ [FreeBSD strnvis argument order is swapped compared to OpenBSD])
TEST_MALLOC_OPTIONS="AJRX"
;;
*-*-bsdi*)