summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-03-20 12:55:14 +1100
committerDamien Miller <djm@mindrot.org>2013-03-20 12:55:14 +1100
commit63b4bcd04e1c57b77eabb4e4d359508a4b2af685 (patch)
tree751bcf38b2b4d26e7b69df583b08ef969fb04548
parentaa86c3970f24fc22185a9561ae84eeae0c6d15cd (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--ChangeLog5
-rw-r--r--configure.ac5
-rw-r--r--log.c2
-rw-r--r--openbsd-compat/vis.c2
-rw-r--r--openbsd-compat/vis.h4
-rw-r--r--scp.c2
-rw-r--r--sshconnect2.c2
7 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 502d85c3b..80429f849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120120318
2 - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c]
3 [openbsd-compat/vis.h] FreeBSD's strnvis isn't compatible with OpenBSD's
4 so mark it as broken. Patch from des AT des.no
5
120120317 620120317
2 - (tim) [configure.ac] OpenServer 5 wants lastlog even though it has none 7 - (tim) [configure.ac] OpenServer 5 wants lastlog even though it has none
3 of the bits the configure test looks for. 8 of the bits the configure test looks for.
diff --git a/configure.ac b/configure.ac
index 5d835c93d..88dd29e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.517 2013/03/17 03:55:47 tim Exp $ 1# $Id: configure.ac,v 1.518 2013/03/20 01:55:15 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.517 $) 18AC_REVISION($Revision: 1.518 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -721,6 +721,7 @@ mips-sony-bsd|mips-sony-newsos4)
721 AC_CHECK_HEADER([net/if_tap.h], , 721 AC_CHECK_HEADER([net/if_tap.h], ,
722 AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support])) 722 AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
723 AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need]) 723 AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])
724 AC_DEFINE([BROKEN_STRNVIS], [1], [FreeBSD strnvis does not do what we need])
724 ;; 725 ;;
725*-*-bsdi*) 726*-*-bsdi*)
726 AC_DEFINE([SETEUID_BREAKS_SETUID]) 727 AC_DEFINE([SETEUID_BREAKS_SETUID])
diff --git a/log.c b/log.c
index 7f4a1b9c6..d69154a67 100644
--- a/log.c
+++ b/log.c
@@ -45,7 +45,7 @@
45#include <syslog.h> 45#include <syslog.h>
46#include <unistd.h> 46#include <unistd.h>
47#include <errno.h> 47#include <errno.h>
48#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 48#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
49# include <vis.h> 49# include <vis.h>
50#endif 50#endif
51 51
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index 3a087b341..f6f5665c1 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -31,7 +31,7 @@
31/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */ 31/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
32 32
33#include "includes.h" 33#include "includes.h"
34#if !defined(HAVE_STRNVIS) 34#if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS)
35 35
36#include <ctype.h> 36#include <ctype.h>
37#include <string.h> 37#include <string.h>
diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h
index 3898a9e70..d1286c99d 100644
--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@@ -35,7 +35,7 @@
35/* OPENBSD ORIGINAL: include/vis.h */ 35/* OPENBSD ORIGINAL: include/vis.h */
36 36
37#include "includes.h" 37#include "includes.h"
38#if !defined(HAVE_STRNVIS) 38#if !defined(HAVE_STRNVIS) || defined(BROKEN_STRNVIS)
39 39
40#ifndef _VIS_H_ 40#ifndef _VIS_H_
41#define _VIS_H_ 41#define _VIS_H_
@@ -92,4 +92,4 @@ ssize_t strnunvis(char *, const char *, size_t)
92 92
93#endif /* !_VIS_H_ */ 93#endif /* !_VIS_H_ */
94 94
95#endif /* !HAVE_STRNVIS */ 95#endif /* !HAVE_STRNVIS || BROKEN_STRNVIS */
diff --git a/scp.c b/scp.c
index 08587b5f2..645d7403b 100644
--- a/scp.c
+++ b/scp.c
@@ -103,7 +103,7 @@
103#include <string.h> 103#include <string.h>
104#include <time.h> 104#include <time.h>
105#include <unistd.h> 105#include <unistd.h>
106#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 106#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
107#include <vis.h> 107#include <vis.h>
108#endif 108#endif
109 109
diff --git a/sshconnect2.c b/sshconnect2.c
index a306447b3..d6af0b940 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -40,7 +40,7 @@
40#include <stdio.h> 40#include <stdio.h>
41#include <string.h> 41#include <string.h>
42#include <unistd.h> 42#include <unistd.h>
43#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 43#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
44#include <vis.h> 44#include <vis.h>
45#endif 45#endif
46 46