summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
-rw-r--r--openbsd-compat/vis.c2
-rw-r--r--openbsd-compat/vis.h4
4 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 63979507f..c43ccc907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030117
2 - (djm) Bug #470: Detect strnvis, not strvis in configure.
3 From d_wllms@lanl.gov
4
120030116 520030116
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2003/01/16 03:41:55 7 - djm@cvs.openbsd.org 2003/01/16 03:41:55
@@ -1027,4 +1031,4 @@
1027 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1031 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1028 ok provos@ 1032 ok provos@
1029 1033
1030$Id: ChangeLog,v 1.2573 2003/01/16 04:39:13 djm Exp $ 1034$Id: ChangeLog,v 1.2574 2003/01/16 23:31:38 djm Exp $
diff --git a/configure.ac b/configure.ac
index 3054a4394..df4168096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.100 2003/01/13 05:55:23 djm Exp $ 1# $Id: configure.ac,v 1.101 2003/01/16 23:31:38 djm Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -606,7 +606,7 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
606 realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ 606 realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
607 setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ 607 setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
608 setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ 608 setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
609 socketpair strerror strlcat strlcpy strmode strvis sysconf \ 609 socketpair strerror strlcat strlcpy strmode strnvis sysconf \
610 tcgetpgrp truncate utimes vhangup vsnprintf waitpid __b64_ntop \ 610 tcgetpgrp truncate utimes vhangup vsnprintf waitpid __b64_ntop \
611 _getpty) 611 _getpty)
612 612
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index 303a9a5b3..fc5741390 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -31,7 +31,7 @@
31 * SUCH DAMAGE. 31 * SUCH DAMAGE.
32 */ 32 */
33#include "config.h" 33#include "config.h"
34#if !defined(HAVE_STRVIS) 34#if !defined(HAVE_STRNVIS)
35 35
36#if defined(LIBC_SCCS) && !defined(lint) 36#if defined(LIBC_SCCS) && !defined(lint)
37static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 millert Exp $"; 37static char rcsid[] = "$OpenBSD: vis.c,v 1.8 2002/02/19 19:39:36 millert Exp $";
diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h
index 98924bde4..5df6f3694 100644
--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@@ -36,7 +36,7 @@
36 * @(#)vis.h 5.9 (Berkeley) 4/3/91 36 * @(#)vis.h 5.9 (Berkeley) 4/3/91
37 */ 37 */
38#include "config.h" 38#include "config.h"
39#if !defined(HAVE_STRVIS) 39#if !defined(HAVE_STRNVIS)
40 40
41#ifndef _VIS_H_ 41#ifndef _VIS_H_
42#define _VIS_H_ 42#define _VIS_H_
@@ -88,4 +88,4 @@ int unvis(char *, char, int *, int);
88 88
89#endif /* !_VIS_H_ */ 89#endif /* !_VIS_H_ */
90 90
91#endif /* !HAVE_STRVIS */ 91#endif /* !HAVE_STRNVIS */