From dd21fe9ca0293264924d9045e7a9aab1e7f31f28 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 27 Jun 2002 18:23:20 +0000 Subject: [PATCH] - (bal) s/config.h/includes.h/ in openbsd-compat/ for *.c. Otherwise wise have issues of our fixes not propogating right (ie bcopy instead of memmove). OK tim --- ChangeLog | 5 ++++- openbsd-compat/base64.c | 2 +- openbsd-compat/bindresvport.c | 2 +- openbsd-compat/getcwd.c | 2 +- openbsd-compat/getopt.c | 2 +- openbsd-compat/inet_ntoa.c | 2 +- openbsd-compat/inet_ntop.c | 2 +- openbsd-compat/rresvport.c | 2 +- openbsd-compat/setenv.c | 2 +- openbsd-compat/sigact.c | 2 +- openbsd-compat/strlcat.c | 2 +- openbsd-compat/strlcpy.c | 2 +- openbsd-compat/strsep.c | 2 +- 13 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeaf7c7b7..75ed2720a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ - (stevesk) [sshd_config] PAMAuthenticationViaKbdInt no; commented options should contain default value. from solar. - (bal) Cygwin uid0 fix by vinschen@redhat.com + - (bal) s/config.h/includes.h/ in openbsd-compat/ for *.c. Otherwise wise + have issues of our fixes not propogating right (ie bcopy instead of + memmove). OK tim 200206027 - OpenBSD CVS Sync @@ -1192,4 +1195,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2309 2002/06/27 18:02:21 mouring Exp $ +$Id: ChangeLog,v 1.2310 2002/06/27 18:23:20 mouring Exp $ diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c index d12b993b7..48ba54256 100644 --- a/openbsd-compat/base64.c +++ b/openbsd-compat/base64.c @@ -42,7 +42,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#include "config.h" +#include "includes.h" #if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index 332bcb016..620f980ed 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c @@ -29,7 +29,7 @@ * Mountain View, California 94043 */ -#include "config.h" +#include "includes.h" #ifndef HAVE_BINDRESVPORT_SA diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c index de3baccbb..6fd8543a5 100644 --- a/openbsd-compat/getcwd.c +++ b/openbsd-compat/getcwd.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #if !defined(HAVE_GETCWD) diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c index f4fbc9bac..4a5cfe5f0 100644 --- a/openbsd-compat/getopt.c +++ b/openbsd-compat/getopt.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET) #if defined(LIBC_SCCS) && !defined(lint) diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index 8a8b3c846..ad228229c 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c index 2b8d31f8d..3a91aecd4 100644 --- a/openbsd-compat/inet_ntop.c +++ b/openbsd-compat/inet_ntop.c @@ -16,7 +16,7 @@ * SOFTWARE. */ -#include "config.h" +#include "includes.h" #ifndef HAVE_INET_NTOP diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c index 44eac2036..9f058961d 100644 --- a/openbsd-compat/rresvport.c +++ b/openbsd-compat/rresvport.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #ifndef HAVE_RRESVPORT_AF diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c index 6c2d5cd31..1dff15c73 100644 --- a/openbsd-compat/setenv.c +++ b/openbsd-compat/setenv.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #ifndef HAVE_SETENV #if defined(LIBC_SCCS) && !defined(lint) diff --git a/openbsd-compat/sigact.c b/openbsd-compat/sigact.c index 806eb02b6..35fbab0eb 100644 --- a/openbsd-compat/sigact.c +++ b/openbsd-compat/sigact.c @@ -33,7 +33,7 @@ * and: Eric S. Raymond * ****************************************************************************/ -#include "config.h" +#include "includes.h" #include #include "sigact.h" diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c index 6ff65c19b..3a9b5d1a7 100644 --- a/openbsd-compat/strlcat.c +++ b/openbsd-compat/strlcat.c @@ -27,7 +27,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #ifndef HAVE_STRLCAT #if defined(LIBC_SCCS) && !defined(lint) diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c index b5e5a552e..2f87eca44 100644 --- a/openbsd-compat/strlcpy.c +++ b/openbsd-compat/strlcpy.c @@ -27,7 +27,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #ifndef HAVE_STRLCPY #if defined(LIBC_SCCS) && !defined(lint) diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c index c03649cff..d0afc44ae 100644 --- a/openbsd-compat/strsep.c +++ b/openbsd-compat/strsep.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #if !defined(HAVE_STRSEP)