Punt HAS_STDLIB_H, NO_STDLIB_H, POSIX_TYPES; see individual ChangeLogs

for details

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10204 dc483132-0cff-0310-8789-dd5450dbe970

27 files changed, 91 insertions, 45 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 73b9a01a94..bc25f3518c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 30 18:56:37 1997  Tom Yu  <tlyu@mit.edu>
+
+	* acconfig.h: Punt HAS_STDLIB_H, NO_STDLIB_H, POSIX_TYPES.
+
 Thu Sep 25 21:06:40 1997  Tom Yu  <tlyu@mit.edu>
 
 	* acconfig.h: Punt HAS_SETVBUF, HAS_UNISTD_H, KRB5_USE_INET.
diff --git a/src/acconfig.h b/src/acconfig.h
index 53c237dd22..99cd7d5221 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -7,18 +7,15 @@
    handle it on some systems.  */
 
 #undef ANSI_STDIO
-#undef HAS_STDLIB_H
 #undef HAS_VOID_TYPE
 #undef KRB5_NO_PROTOTYPES
 #undef KRB5_PROVIDE_PROTOTYPES
 #undef KRB5_NO_NESTED_PROTOTYPES
-#undef NO_STDLIB_H
 
 #undef NO_YYLINENO
 #undef POSIX_FILE_LOCKS
 #undef POSIX_SIGTYPE
 #undef POSIX_TERMIOS
-#undef POSIX_TYPES
 #undef USE_DIRENT_H
 #undef WAIT_USES_INT
 #undef krb5_sigtype
@@ -32,6 +29,9 @@
 /* Define if Kerberos V4 backwards compatibility should be supported */
 #undef KRB5_KRB4_COMPAT
 
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef time_t
+
 /*
  * The stuff following here is taken from util/db2/acconfig.h
  */
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index a82c21bc4b..7853a60d05 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 30 18:56:05 1997  Tom Yu  <tlyu@mit.edu>
+
+	* win-mac.h: Replace HAS_STDLIB_H with something more sane.
+
+	* k5-int.h: Replace HAS_STDLIB_H, NO_STDLIB_H with something more
+ 	sane.
+
 Thu Sep 25 21:10:37 1997  Tom Yu  <tlyu@mit.edu>
 
 	* win-mac.h: Replace KRB5_USE_INET with something more sane.
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index acb0fca197..7ce0409016 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -350,20 +350,16 @@ typedef struct _krb5_sam_response {
 #ifndef KRB5_EXT_PROTO__
 #define KRB5_EXT_PROTO__
 
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 #if defined(__STDC__) || defined(_MSDOS)
-#ifdef NO_STDLIB_H
 #include <fake-stdlib.h>
 #else
-#include <stdlib.h>
-#endif /* NO_STDLIB_H */
-#else
 extern char *malloc(), *realloc(), *calloc();
 extern char *getenv();
 #endif /* ! __STDC__ */
-#endif /* HAS_STDLIB_H */
+#endif /* HAVE_STDLIB_H */
 
 #ifdef HAVE_STRING_H
 #include <string.h>
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 826e96773c..af6652b8b9 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 30 17:19:16 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Remove references to dbm and ndbm.  Replace
+	HAS_STDLIB_H and NO_STDLIB_H with something more sane.  Replace
+	AC_TIME_WITH_SYS_TIME with more a recent form.  Use AC_CHECK_TYPE
+	to check for time_t instead of erroneously named POSIX_TYPES.
+
 Thu Sep 25 21:50:44 1997  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Replace KRB5_USE_INET, HAS_UNISTD_H, HAS_SETVBUF.
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index f197553267..1f38ffc30d 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -13,16 +13,13 @@ AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
 
 KRB5_POSIX_LOCKS
 
-dnl time_t, only used in lib/krb5/os/timeofday.c
-AC_EGREP_HEADER(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
-
 KRB5_SIGTYPE
 
 dnl
 dnl
-AC_CHECK_HEADERS(string.h unistd.h)
-AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H))
-AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h macsock.h stddef.h xom.h dbm.h ndbm.h)
+AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h)
+AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h)
+AC_CHECK_HEADERS(macsock.h xom.h)
 AC_HEADER_STDARG
 
 dnl check for ANSI stdio, esp "b" option to fopen().  This (unfortunately)
@@ -82,14 +79,12 @@ AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 
 dnl then from osconf.h, we have
-AC_TIME_WITH_SYS_TIME
+AC_HEADER_TIME
 AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_TYPE(time_t, long)
 
 AC_CHECK_HEADERS(netinet/in.h)
 
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
-
 dnl
 dnl Determine where to put the replay cache.
 dnl
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index cd787d0c71..a764943365 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -149,7 +149,7 @@ typedef unsigned char	u_char;
 #define KRB5_PROVIDE_PROTOTYPES
 #define HAVE_STDARG_H
 #define HAVE_SYS_TYPES_H
-#define HAS_STDLIB_H
+#define HAVE_STDLIB_H
 
 /* This controls which encryption routines libcrypto will provide */
 #define PROVIDE_DES_CBC_MD5
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 3540a4c980..5fb5d77242 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 30 18:58:09 1997  Tom Yu  <tlyu@mit.edu>
+
+	* ktutil.c: Replace HAS_STDLIB_H with something more sane.
+
 Tue Feb  4 21:11:33 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index e74ab117cb..0106ed7582 100644
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -29,7 +29,7 @@
 #include "adm_proto.h"
 #include <ss/ss.h>
 #include <stdio.h>
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 2f62b2bdd0..08d828d996 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,19 @@
+Tue Sep 30 19:00:33 1997  Tom Yu  <tlyu@mit.edu>
+
+	* tkt_string.c: Replace HAS_STDLIB_H with something more sane.
+
+	* send_to_kdc.c: Replace HAS_STDLIB_H with something more sane.
+
+	* realmofhost.c: Replace HAS_STDLIB_H with something more sane.
+
+	* mk_preauth.c: Repalce HAS_STDLIB_H with something more sane.
+
+	* memcache.c: Replace HAS_STDLIB_H with something more sane.
+
+	* kparse.c: Replace HAS_STDLIB_H with something more sane.
+
+	* configure.in: Replace HAS_STDLIB_H with something more sane.
+
 Thu Sep 25 21:11:16 1997  Tom Yu  <tlyu@mit.edu>
 
 	* put_svc_key.c: Replace HAS_UNISTD_H with something more sane.
diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 179174e6e9..10acfeda61 100644
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -9,7 +9,7 @@ KRB5_POSIX_LOCKS
 AC_CHECK_HEADERS(sys/select.h time.h unistd.h)
 dnl Could check for full stdc environment, but will only test
 dnl for stdlib.h
-AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H))
+AC_CHECK_HEADERS(stdlib.h)
 
 AC_C_CROSS dnl pretty up output, eval this before AC_TRY_RUN
 dnl need MSBFIRST, LSBFIRST, BITS16, BITS32
diff --git a/src/lib/krb4/kparse.c b/src/lib/krb4/kparse.c
index 198ae1e898..811f0bf391 100644
--- a/src/lib/krb4/kparse.c
+++ b/src/lib/krb4/kparse.c
@@ -54,7 +54,7 @@ static char *strutol();
 #ifndef HAVE_STRSAVE
 static char *strsave();
 #endif
-#ifndef HAS_STDLIB_H
+#ifndef HAVE_STDLIB_H
 extern char *malloc();
 #endif
 
diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c
index 7484342aaa..d2669df9b4 100644
--- a/src/lib/krb4/memcache.c
+++ b/src/lib/krb4/memcache.c
@@ -35,7 +35,7 @@ typedef DWORD OSErr;
 
 #include <stdio.h>
 #include <errno.h>
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 extern char *malloc (), *realloc ();
diff --git a/src/lib/krb4/mk_preauth.c b/src/lib/krb4/mk_preauth.c
index feb12b7ab9..949fd1d253 100644
--- a/src/lib/krb4/mk_preauth.c
+++ b/src/lib/krb4/mk_preauth.c
@@ -15,7 +15,7 @@
 #include "krb.h"
 #include <string.h>
 
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 extern char *malloc(), *calloc(), *realloc();
diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c
index b15ce94147..90e01bb348 100644
--- a/src/lib/krb4/realmofhost.c
+++ b/src/lib/krb4/realmofhost.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 extern char *malloc();
diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c
index 7f9620d128..c7e0fb33b8 100644
--- a/src/lib/krb4/send_to_kdc.c
+++ b/src/lib/krb4/send_to_kdc.c
@@ -21,7 +21,7 @@
 
 #define S_AD_SZ sizeof(struct sockaddr_in)
 
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 extern char *malloc(), *calloc(), *realloc();
diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c
index f1554ab97f..db1230b90f 100644
--- a/src/lib/krb4/tkt_string.c
+++ b/src/lib/krb4/tkt_string.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
 char *getenv();
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index c3b56a751e..cfdbde3820 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 30 19:03:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* krbasn1.h: Replace HAS_STDLIB_H with something more sane.
+
 Thu Jul 31 15:38:10 1997  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
         * asn1buf.h (asn1buf_remove_octet, asn1buf_size, asn1buf_free,
diff --git a/src/lib/krb5/asn.1/krbasn1.h b/src/lib/krb5/asn.1/krbasn1.h
index eb63258fc5..c8fe0a4330 100644
--- a/src/lib/krb5/asn.1/krbasn1.h
+++ b/src/lib/krb5/asn.1/krbasn1.h
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>		/* For INT_MAX */
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 /*
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index d50f8e38f7..7d143d202b 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,16 @@
+Wed Oct  1 04:58:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Punt some things that are otherwise gotten from
+	include/krb5/configure.in.
+
+	* gmt_mktime.c: Get k5-int.h to get some autoconf symbols.
+
+Tue Sep 30 19:57:27 1997  Tom Yu  <tlyu@mit.edu>
+
+	* timeofday.c: Replaace erroneously named POSIX_TYPES and timetype
+	with plain old time_t, since we're using AC_CHECK_TYPE now to
+	handle it.
+
 Thu Sep 25 21:24:54 1997  Tom Yu  <tlyu@mit.edu>
 
 	* mk_faddr.c: Replace KRB5_USE_INET with something more sane.
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index e24008d964..7c3f343a5c 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -1,9 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-dnl time checks are for timeofday.c (which gets them from osconf.h)
-dnl and gmt_mktime.c (which only gets them from here...)
-AC_TIME_WITH_SYS_TIME
-AC_HAVE_HEADERS(unistd.h sys/time.h regex.h regexp.h regexpr.h)
+AC_HAVE_HEADERS(regex.h regexp.h regexpr.h)
 
 dnl regcomp is present but non-functional on Solaris 2.4
 AC_C_CROSS
@@ -24,7 +21,6 @@ dnl no -lgen.  This is fine.
 AC_CHECK_FUNCS(compile step)
 LIBS="$save_LIBS"
 AC_HAVE_FUNCS(re_comp)
-AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
 AC_DEFINE(AN_TO_LN_RULES)
 KRB5_BUILD_PROGRAM
diff --git a/src/lib/krb5/os/gmt_mktime.c b/src/lib/krb5/os/gmt_mktime.c
index 1cb5c2668c..b231790ae3 100644
--- a/src/lib/krb5/os/gmt_mktime.c
+++ b/src/lib/krb5/os/gmt_mktime.c
@@ -1,6 +1,7 @@
 /* This code placed in the public domain by Mark W. Eichin */
 
 #include <stdio.h>
+#include "k5-int.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c
index 131406fbb4..42fc42fcc6 100644
--- a/src/lib/krb5/os/timeofday.c
+++ b/src/lib/krb5/os/timeofday.c
@@ -29,12 +29,6 @@
 
 #include <time.h>
 
-#ifdef POSIX_TYPES
-#define timetype time_t
-#else
-#define timetype long
-#endif
-
 #ifndef HAVE_ERRNO
 extern int errno;
 #endif
@@ -45,7 +39,7 @@ krb5_timeofday(context, timeret)
     register krb5_int32 FAR *timeret;
 {
     krb5_os_context os_ctx = context->os_context;
-    timetype tval;
+    time_t tval;
 
     if (os_ctx->os_flags & KRB5_OS_TOFFSET_TIME) {
 	    *timeret = os_ctx->time_offset;
@@ -62,7 +56,7 @@ krb5_timeofday(context, timeret)
 #else
     tval = time(0);
 #endif
-    if (tval == (timetype) -1)
+    if (tval == (time_t) -1)
 	return (krb5_error_code) errno;
     if (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)
 	    tval += os_ctx->time_offset;
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index af9e054961..dc17db10e7 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 30 19:04:20 1997  Tom Yu  <tlyu@mit.edu>
+
+	* autoconf.h: Replace HAS_STDLIB_H with something more sane.  Punt
+	POSIX_TYPES.
+
 Thu Sep 25 21:05:23 1997  Tom Yu  <tlyu@mit.edu>
 
 	* autoconf.h: Change HAS_SETVBUF, KRB5_USE_INET to something more
diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index 2531b711d2..ba6b6f0ae7 100644
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -2,12 +2,11 @@
 
 #define HAVE_SETVBUF 1
 #define HAS_ANSI_CONST 1
-#define HAS_STDLIB_H 1
+#define HAVE_STDLIB_H 1
 #define HAS_VOID_TYPE 1
 #define KRB5_PROVIDE_PROTOTYPES 1
 #define NO_NESTED_PROTOTYPES 1
 #define NO_YYLINENO 1
-#define POSIX_TYPES 1
 #define USE_DIRENT_H 1
 #define HAVE_STRING_H 1
 #define WAIT_USES_INT 1
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 656f400b3e..5954edddc5 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  1 04:53:30 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Default to a long rather than an int for a time_t
+	for paranoia reasons.
+
 Tue Jun  3 23:05:07 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* getpty.c (pty_getpty): Remove erroneous space from the HPUX open().
diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index e1b22719f9..95d77db1c6 100644
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -51,7 +51,7 @@ AC_SUBST(LOGINLIBS)
 dnl
 AC_CHECK_LIB(util,openpty, AC_DEFINE(HAVE_OPENPTY) LIBS="$LIBS -lutil")
 AC_TYPE_MODE_T
-AC_CHECK_TYPE(time_t, int)
+AC_CHECK_TYPE(time_t, long)
 AC_FUNC_CHECK(strsave,AC_DEFINE(HAS_STRSAVE))
 AC_HAVE_FUNCS(getutent setreuid gettosbyname setsid ttyname line_push ptsname grantpt openpty logwtmp getutmpx)
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h utmpx.h utmp.h sys/filio.h sys/sockio.h sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)