diff options
author | Damien Miller <djm@mindrot.org> | 2013-03-20 12:55:14 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-03-20 12:55:14 +1100 |
commit | 63b4bcd04e1c57b77eabb4e4d359508a4b2af685 (patch) | |
tree | 751bcf38b2b4d26e7b69df583b08ef969fb04548 | |
parent | aa86c3970f24fc22185a9561ae84eeae0c6d15cd (diff) |
- (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
[openbsd-compat/vis.h] FreeBSD's strnvis isn't compatible with OpenBSD's
so mark it as broken. Patch from des AT des.no
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | log.c | 2 | ||||
-rw-r--r-- | openbsd-compat/vis.c | 2 | ||||
-rw-r--r-- | openbsd-compat/vis.h | 4 | ||||
-rw-r--r-- | scp.c | 2 | ||||
-rw-r--r-- | sshconnect2.c | 2 |
7 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,8 @@ +20120318 + - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c] + [openbsd-compat/vis.h] FreeBSD's strnvis isn't compatible with OpenBSD's + so mark it as broken. Patch from des AT des.no + 20120317 - (tim) [configure.ac] OpenServer 5 wants lastlog even though it has none of the bits the configure test looks for. diff --git a/configure.ac b/configure.ac index 5d835c93..88dd29e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.517 2013/03/17 03:55:47 tim Exp $ +# $Id: configure.ac,v 1.518 2013/03/20 01:55:15 djm 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.517 $) +AC_REVISION($Revision: 1.518 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -721,6 +721,7 @@ 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]) ;; *-*-bsdi*) AC_DEFINE([SETEUID_BREAKS_SETUID]) @@ -45,7 +45,7 @@ #include <syslog.h> #include <unistd.h> #include <errno.h> -#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) +#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) # include <vis.h> #endif diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c index 3a087b34..f6f5665c 100644 --- a/openbsd-compat/vis.c +++ b/openbsd-compat/vis.c @@ -31,7 +31,7 @@ /* OPENBSD ORIGINAL: lib/libc/gen/vis.c */ #include "includes.h" -#if !defined(HAVE_STRNVIS) +#if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) #include <ctype.h> #include <string.h> diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h index 3898a9e7..d1286c99 100644 --- a/openbsd-compat/vis.h +++ b/openbsd-compat/vis.h @@ -35,7 +35,7 @@ /* OPENBSD ORIGINAL: include/vis.h */ #include "includes.h" -#if !defined(HAVE_STRNVIS) +#if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS) #ifndef _VIS_H_ #define _VIS_H_ @@ -92,4 +92,4 @@ ssize_t strnunvis(char *, const char *, size_t) #endif /* !_VIS_H_ */ -#endif /* !HAVE_STRNVIS */ +#endif /* !HAVE_STRNVIS || BROKEN_STRNVIS */ @@ -103,7 +103,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) +#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) #include <vis.h> #endif diff --git a/sshconnect2.c b/sshconnect2.c index a306447b..d6af0b94 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -40,7 +40,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> -#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) +#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) #include <vis.h> #endif |