From 5576c833a5faffb66c7dc4d48f231a30d99de091 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Tue, 20 Jun 1995 19:06:36 +0000
Subject: [PATCH] 	* strrchr.c: NO_STRING_H -> HAVE_STRING_H

	* strftime.c: NO_STRING_H -> HAVE_STRING_H

	* strerror.c: NO_STRING_H -> HAVE_STRING_H

	* strdup.c: NO_STRING_H -> HAVE_STRING_H

	* strchr.c: NO_STRING_H -> HAVE_STRING_H

	* strcasecmp.c: NO_STRING_H -> HAVE_STRING_H

	* spx.c: NO_STRING_H -> HAVE_STRING_H

	* rsaencpwd: NO_STRING_H -> HAVE_STRING_H

	* read_password.c: NO_STRING_H -> HAVE_STRING_H

	* mem.c: NO_STRING_H -> HAVE_STRING_H

	* krb4encpwd.c: NO_STRING_H -> HAVE_STRING_H

	* kerberos5.c: NO_STRING_H -> HAVE_STRING_H

	* kerberos.c: NO_STRING_H -> HAVE_STRING_H

	* encrypt.c: NO_STRING_H -> HAVE_STRING_H

	* auth.c: NO_STRING_H -> HAVE_STRING_H for consistency

	* configure.in: added missing tests for string.h, stdlib.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6101 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/telnet/libtelnet/ChangeLog       | 34 +++++++++++++++++++++++
 src/appl/telnet/libtelnet/auth.c          |  6 ++--
 src/appl/telnet/libtelnet/configure.in    |  1 +
 src/appl/telnet/libtelnet/encrypt.c       |  6 ++--
 src/appl/telnet/libtelnet/kerberos.c      |  6 ++--
 src/appl/telnet/libtelnet/kerberos5.c     |  6 ++--
 src/appl/telnet/libtelnet/krb4encpwd.c    |  6 ++--
 src/appl/telnet/libtelnet/mem.c           |  6 ++--
 src/appl/telnet/libtelnet/read_password.c |  6 ++--
 src/appl/telnet/libtelnet/rsaencpwd.c     |  6 ++--
 src/appl/telnet/libtelnet/spx.c           |  6 ++--
 src/appl/telnet/libtelnet/strcasecmp.c    |  6 ++--
 src/appl/telnet/libtelnet/strchr.c        |  6 ++--
 src/appl/telnet/libtelnet/strdup.c        |  6 ++--
 src/appl/telnet/libtelnet/strerror.c      |  6 ++--
 src/appl/telnet/libtelnet/strftime.c      |  6 ++--
 src/appl/telnet/libtelnet/strrchr.c       |  6 ++--
 17 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index b5fc6033a..9a4543e43 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,37 @@
+Tue Jun 20 13:59:43 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* strrchr.c: NO_STRING_H -> HAVE_STRING_H
+
+	* strftime.c: NO_STRING_H -> HAVE_STRING_H
+
+	* strerror.c: NO_STRING_H -> HAVE_STRING_H
+
+	* strdup.c: NO_STRING_H -> HAVE_STRING_H
+
+	* strchr.c: NO_STRING_H -> HAVE_STRING_H
+
+	* strcasecmp.c: NO_STRING_H -> HAVE_STRING_H
+
+	* spx.c: NO_STRING_H -> HAVE_STRING_H
+
+	* rsaencpwd: NO_STRING_H -> HAVE_STRING_H
+
+	* read_password.c: NO_STRING_H -> HAVE_STRING_H
+
+	* mem.c: NO_STRING_H -> HAVE_STRING_H
+
+	* krb4encpwd.c: NO_STRING_H -> HAVE_STRING_H
+
+	* kerberos5.c: NO_STRING_H -> HAVE_STRING_H
+
+	* kerberos.c: NO_STRING_H -> HAVE_STRING_H
+
+	* encrypt.c: NO_STRING_H -> HAVE_STRING_H
+
+	* auth.c: NO_STRING_H -> HAVE_STRING_H for consistency
+
+	* configure.in: added missing tests for string.h, stdlib.h
+
 Sat Jun 10 22:59:42 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* forward.c, kerberos5.c: krb5_auth_context redefinitions
diff --git a/src/appl/telnet/libtelnet/auth.c b/src/appl/telnet/libtelnet/auth.c
index c3537d9e9..dc54fb07a 100644
--- a/src/appl/telnet/libtelnet/auth.c
+++ b/src/appl/telnet/libtelnet/auth.c
@@ -63,10 +63,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 #include "encrypt.h"
diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index 44424a3a7..48480fe9c 100644
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -5,6 +5,7 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_REPLACE_FUNCS([strcasecmp strdup setenv setsid strerror strftime getopt herror])
 AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
+AC_CHECK_HEADEERS(stdlib.h string.h)
 LIBOBJS="$LIBOBJS getent.o"
 AC_CONST
 if test "$KRB4_LIB" = ''; then
diff --git a/src/appl/telnet/libtelnet/encrypt.c b/src/appl/telnet/libtelnet/encrypt.c
index 94ea23fb4..f292c69d7 100644
--- a/src/appl/telnet/libtelnet/encrypt.c
+++ b/src/appl/telnet/libtelnet/encrypt.c
@@ -64,10 +64,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 /*
diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c
index 92ba2cf4a..4ace00430 100644
--- a/src/appl/telnet/libtelnet/kerberos.c
+++ b/src/appl/telnet/libtelnet/kerberos.c
@@ -62,10 +62,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 #include "encrypt.h"
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 42255b349..8ec35542c 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -71,10 +71,10 @@
 #else
 extern char *malloc();
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
  
 #include "encrypt.h"
diff --git a/src/appl/telnet/libtelnet/krb4encpwd.c b/src/appl/telnet/libtelnet/krb4encpwd.c
index b029983a4..6515e6dc5 100644
--- a/src/appl/telnet/libtelnet/krb4encpwd.c
+++ b/src/appl/telnet/libtelnet/krb4encpwd.c
@@ -78,10 +78,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 #include "encrypt.h"
diff --git a/src/appl/telnet/libtelnet/mem.c b/src/appl/telnet/libtelnet/mem.c
index 1f070d3c6..5a2ced8d5 100644
--- a/src/appl/telnet/libtelnet/mem.c
+++ b/src/appl/telnet/libtelnet/mem.c
@@ -48,10 +48,10 @@ typedef int size_t;
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 #include <limits.h>
 
diff --git a/src/appl/telnet/libtelnet/read_password.c b/src/appl/telnet/libtelnet/read_password.c
index efeca30c0..d9d61f488 100644
--- a/src/appl/telnet/libtelnet/read_password.c
+++ b/src/appl/telnet/libtelnet/read_password.c
@@ -50,10 +50,10 @@
 #if	defined(RSA_ENCPWD) || defined(KRB4_ENCPWD)
 
 #include <stdio.h>
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 #include <sys/ioctl.h>
 #include <signal.h>
diff --git a/src/appl/telnet/libtelnet/rsaencpwd.c b/src/appl/telnet/libtelnet/rsaencpwd.c
index c29ddbf32..a26f3d2f0 100644
--- a/src/appl/telnet/libtelnet/rsaencpwd.c
+++ b/src/appl/telnet/libtelnet/rsaencpwd.c
@@ -75,10 +75,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 #include "encrypt.h"
diff --git a/src/appl/telnet/libtelnet/spx.c b/src/appl/telnet/libtelnet/spx.c
index d41e3a221..4fd9cfb43 100644
--- a/src/appl/telnet/libtelnet/spx.c
+++ b/src/appl/telnet/libtelnet/spx.c
@@ -74,10 +74,10 @@
 #ifdef	__STDC__
 #include <stdlib.h>
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 #include <pwd.h>
diff --git a/src/appl/telnet/libtelnet/strcasecmp.c b/src/appl/telnet/libtelnet/strcasecmp.c
index 6566d25bb..3c1140b0f 100644
--- a/src/appl/telnet/libtelnet/strcasecmp.c
+++ b/src/appl/telnet/libtelnet/strcasecmp.c
@@ -36,10 +36,10 @@
 #endif
 
 #include <sys/cdefs.h>
-#ifdef NO_STRING_H
-#include <strings.h>
-#else
+#ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 /* based on @(#)strcasecmp.c	8.1 (Berkeley) 6/4/93 */
diff --git a/src/appl/telnet/libtelnet/strchr.c b/src/appl/telnet/libtelnet/strchr.c
index 67602494c..91f5612fa 100644
--- a/src/appl/telnet/libtelnet/strchr.c
+++ b/src/appl/telnet/libtelnet/strchr.c
@@ -33,10 +33,10 @@
 
 /* based on @(#)strchr.c	8.1 (Berkeley) 6/4/93 */
 
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 char *
diff --git a/src/appl/telnet/libtelnet/strdup.c b/src/appl/telnet/libtelnet/strdup.c
index 50002c378..d501ed992 100644
--- a/src/appl/telnet/libtelnet/strdup.c
+++ b/src/appl/telnet/libtelnet/strdup.c
@@ -41,10 +41,10 @@
 
 #include <stddef.h>
 #include <stdlib.h>
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 char *
diff --git a/src/appl/telnet/libtelnet/strerror.c b/src/appl/telnet/libtelnet/strerror.c
index f2f2e156a..8bed9c670 100644
--- a/src/appl/telnet/libtelnet/strerror.c
+++ b/src/appl/telnet/libtelnet/strerror.c
@@ -33,10 +33,10 @@
 
 /* based on @(#)strerror.c	8.1 (Berkeley) 6/4/93 */
 
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 char *
diff --git a/src/appl/telnet/libtelnet/strftime.c b/src/appl/telnet/libtelnet/strftime.c
index 9117e0851..f2bcc676c 100644
--- a/src/appl/telnet/libtelnet/strftime.c
+++ b/src/appl/telnet/libtelnet/strftime.c
@@ -44,10 +44,10 @@
 #else
 #define TM_YEAR_BASE	1900	/* from <tzfile.h> */
 #endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 static char *afmt[] = {
diff --git a/src/appl/telnet/libtelnet/strrchr.c b/src/appl/telnet/libtelnet/strrchr.c
index fa800573e..f65a7e805 100644
--- a/src/appl/telnet/libtelnet/strrchr.c
+++ b/src/appl/telnet/libtelnet/strrchr.c
@@ -33,10 +33,10 @@
 
 /* based on @(#)strrchr.c	8.1 (Berkeley) 6/4/93 */
 
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
+#ifdef	HAVE_STRING_H
 #include <string.h>
+#else
+#include <strings.h>
 #endif
 
 char *
-- 
2.26.2