* 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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index b5fc6033a13e702f44647bbcc06250080d7fa08f..9a4543e43e05155508483964ae51f17369cf370d 100644 (file)
--- 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 c3537d9e911df8301f17a31671cfd32d1df177b0..dc54fb07a15318d081e34502f85da910950c9638 100644 (file)
--- 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 44424a3a7cf486ccb4dd732bd668771f173a1988..48480fe9c72277d06a23aa478590c2a3606a6f8a 100644 (file)
--- 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 94ea23fb440220b0afbf72aada8bcdc910c605e5..f292c69d7882be40d3a5b687dde1ebec21a0a584 100644 (file)
--- 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 92ba2cf4a6d86da7a6364c68ecb416aa2a1a1ae2..4ace004309d5db7406921b77ed37816db209e906 100644 (file)
--- 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 42255b3496c3ba2a7f41ac023873c4019d342c75..8ec35542c681e76b9a34b49d61633adf331b816e 100644 (file)
--- 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 b029983a4b21b4d07c56cc50f7c515ed15d67415..6515e6dc5de65d2bf66ad5a4d44972d16bd4d378 100644 (file)
--- 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 1f070d3c6c78b2377953b9d76531acb53c6b77d1..5a2ced8d5a1647a69b44f72b6c4f6de872038ec2 100644 (file)
--- 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 efeca30c08f3ea4cb0431b1bce2a0c144a6c52ad..d9d61f488405b8bcc19a91cb60d6d91f81e9db2e 100644 (file)
--- 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 c29ddbf320cfbd3ecb48c70b40244dbd96393450..a26f3d2f0ffb0f91e0d601d17c5a5f85dedf4813 100644 (file)
--- 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 d41e3a221b0d25bc36770a619b799538beb63a8c..4fd9cfb43638a6227dc0b94e62d3cfa3f401d0b4 100644 (file)
--- 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 6566d25bbfa883ca2610b2ea0b1207a6a50c874e..3c1140b0fa822c7c981a9ae66171efd60d5ca770 100644 (file)
--- 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 67602494c5648c7bdc4890d15c9f150595d7edce..91f5612fa64094dea7a6f36be6d12f157d526a8d 100644 (file)
--- 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 50002c378f2622843736d3206aac9572b2306af9..d501ed992b557408aac41ab93980db4307bcbd1a 100644 (file)
--- 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 f2f2e156a5bb52b41845a00b40e112052f627bc9..8bed9c670ea798c0cacd1d24ab791be7ee7899a0 100644 (file)
--- 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 9117e08516d02872c70098e14dbd1a89737eb1b4..f2bcc676cde8bf3221f5d9f8ce1d4c74da34c6e6 100644 (file)
--- 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 fa800573e219075e00ba6e4e91e675e7d61e9121..f65a7e8058ee794e8f94e2c99df2ae3a5013fae0 100644 (file)
--- 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 *