From 467e062e49f66de90febd82ddcfe58f27ccf3903 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 2 Oct 1997 20:42:05 +0000 Subject: 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 --- src/lib/krb4/ChangeLog | 16 ++++++++++++++++ src/lib/krb4/configure.in | 2 +- src/lib/krb4/kparse.c | 2 +- src/lib/krb4/memcache.c | 2 +- src/lib/krb4/mk_preauth.c | 2 +- src/lib/krb4/realmofhost.c | 2 +- src/lib/krb4/send_to_kdc.c | 2 +- src/lib/krb4/tkt_string.c | 2 +- src/lib/krb5/asn.1/ChangeLog | 4 ++++ src/lib/krb5/asn.1/krbasn1.h | 2 +- src/lib/krb5/os/ChangeLog | 13 +++++++++++++ src/lib/krb5/os/configure.in | 6 +----- src/lib/krb5/os/gmt_mktime.c | 1 + src/lib/krb5/os/timeofday.c | 10 ++-------- 14 files changed, 45 insertions(+), 21 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 2f62b2bdd..08d828d99 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,19 @@ +Tue Sep 30 19:00:33 1997 Tom Yu + + * 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 * 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 179174e6e..10acfeda6 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 198ae1e89..811f0bf39 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 7484342aa..d2669df9b 100644 --- a/src/lib/krb4/memcache.c +++ b/src/lib/krb4/memcache.c @@ -35,7 +35,7 @@ typedef DWORD OSErr; #include #include -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include #else extern char *malloc (), *realloc (); diff --git a/src/lib/krb4/mk_preauth.c b/src/lib/krb4/mk_preauth.c index feb12b7ab..949fd1d25 100644 --- a/src/lib/krb4/mk_preauth.c +++ b/src/lib/krb4/mk_preauth.c @@ -15,7 +15,7 @@ #include "krb.h" #include -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include #else extern char *malloc(), *calloc(), *realloc(); diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c index b15ce9414..90e01bb34 100644 --- a/src/lib/krb4/realmofhost.c +++ b/src/lib/krb4/realmofhost.c @@ -16,7 +16,7 @@ #include #include #include -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include #else extern char *malloc(); diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index 7f9620d12..c7e0fb33b 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 #else extern char *malloc(), *calloc(), *realloc(); diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c index f1554ab97..db1230b90 100644 --- a/src/lib/krb4/tkt_string.c +++ b/src/lib/krb4/tkt_string.c @@ -14,7 +14,7 @@ #include #include -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include #else char *getenv(); diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index c3b56a751..cfdbde382 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 + + * krbasn1.h: Replace HAS_STDLIB_H with something more sane. + Thu Jul 31 15:38:10 1997 Ezra Peisach * 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 eb63258fc..c8fe0a433 100644 --- a/src/lib/krb5/asn.1/krbasn1.h +++ b/src/lib/krb5/asn.1/krbasn1.h @@ -5,7 +5,7 @@ #include #include #include /* For INT_MAX */ -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include #endif /* diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index d50f8e38f..7d143d202 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 + + * 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 + + * 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 * 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 e24008d96..7c3f343a5 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 1cb5c2668..b231790ae 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 +#include "k5-int.h" #ifdef HAVE_SYS_TYPES_H #include diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c index 131406fbb..42fc42fcc 100644 --- a/src/lib/krb5/os/timeofday.c +++ b/src/lib/krb5/os/timeofday.c @@ -29,12 +29,6 @@ #include -#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; -- cgit