From 358083bde516dafb4806d38861ab1f532d687274 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 5 Mar 2003 03:38:51 +0000 Subject: Reduce local configure script's work by removing static defines and header and function info available in krb5/autoconf.h. * gethostname.c, getst.c, kadm_net.c, klog.c, kparse.c: Include krb5/autoconf.h. * kuserok.c, log.c, memcache.c, mk_preauth.c, netread.c: Ditto. * netwrite.c, put_svc_key.c, recvauth.c, send_to_kdc.c: Ditto. * tkt_string.c: Ditto. * Makefile.in: Update dependencies. (DEFINES): Define KRB4_USE_KEYTAB. * configure.in: Don't define KRB4_USE_KEYTAB. Don't check for any headers or functions; include/configure.in already does it. Don't invoke AC_C_CONST explicitly; CONFIG_RULES does that. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15230 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb4/ChangeLog | 13 +++++++++++++ src/lib/krb4/Makefile.in | 41 ++++++++++++++++++++--------------------- src/lib/krb4/configure.in | 8 -------- src/lib/krb4/gethostname.c | 1 + src/lib/krb4/getst.c | 1 + src/lib/krb4/kadm_net.c | 1 + src/lib/krb4/klog.c | 1 + src/lib/krb4/kparse.c | 1 + src/lib/krb4/kuserok.c | 1 + src/lib/krb4/log.c | 1 + src/lib/krb4/memcache.c | 1 + src/lib/krb4/mk_preauth.c | 1 + src/lib/krb4/netread.c | 1 + src/lib/krb4/netwrite.c | 1 + src/lib/krb4/put_svc_key.c | 1 + src/lib/krb4/recvauth.c | 1 + src/lib/krb4/send_to_kdc.c | 1 + src/lib/krb4/tkt_string.c | 1 + 18 files changed, 48 insertions(+), 29 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index bd31edc..cfb5f42 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,16 @@ +2003-03-04 Ken Raeburn + + * gethostname.c, getst.c, kadm_net.c, klog.c, kparse.c: Include + krb5/autoconf.h. + * kuserok.c, log.c, memcache.c, mk_preauth.c, netread.c: Ditto. + * netwrite.c, put_svc_key.c, recvauth.c, send_to_kdc.c: Ditto. + * tkt_string.c: Ditto. + * Makefile.in: Update dependencies. + (DEFINES): Define KRB4_USE_KEYTAB. + * configure.in: Don't define KRB4_USE_KEYTAB. Don't check for any + headers or functions; include/configure.in already does it. Don't + invoke AC_C_CONST explicitly; CONFIG_RULES does that. + 2003-03-03 Tom Yu * g_cnffile.c (krb__get_srvtabname): Keep strdup()ed string in a diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 3f58247..0a8ecff 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -3,6 +3,7 @@ myfulldir=lib/krb4 mydir=. BUILDTOP=$(REL)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kerberosIV -I$(srcdir)/../../include/kerberosIV -I. +DEFINES= -DKRB4_USE_KEYTAB ##DOS##BUILDTOP = ..\.. ##DOS##LIBNAME=$(OUTPRE)krb4.lib @@ -317,8 +318,8 @@ gethostname.so gethostname.po $(OUTPRE)gethostname.$(OBJEXT): gethostname.c $(SR $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h kadm_err.so kadm_err.po $(OUTPRE)kadm_err.$(OBJEXT): kadm_err.c $(COM_ERR_DEPS) -kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): kadm_net.c $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ +kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): kadm_net.c $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krbports.h \ $(SRCTOP)/include/kerberosIV/kadm.h $(BUILDTOP)/include/kerberosIV/kadm_err.h \ @@ -406,8 +407,8 @@ rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c $(SRCTOP)/include/ke send_to_kdc.so send_to_kdc.po $(OUTPRE)send_to_kdc.$(OBJEXT): send_to_kdc.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krbports.h \ - $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \ + $(SRCTOP)/include/kerberosIV/prot.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/fake-addrinfo.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-int.h \ $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/kdb.h krb4int.h @@ -425,7 +426,7 @@ rd_preauth.so rd_preauth.po $(OUTPRE)rd_preauth.$(OBJEXT): rd_preauth.c $(SRCTOP $(BUILDTOP)/include/krb5/autoconf.h mk_preauth.so mk_preauth.po $(OUTPRE)mk_preauth.$(OBJEXT): mk_preauth.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): unix_time.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h @@ -446,8 +447,8 @@ in_tkt.so in_tkt.po $(OUTPRE)in_tkt.$(OBJEXT): in_tkt.c $(SRCTOP)/include/kerber $(BUILDTOP)/include/krb5/autoconf.h tkt_string.so tkt_string.po $(OUTPRE)tkt_string.$(OBJEXT): tkt_string.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h g_tf_fname.so g_tf_fname.po $(OUTPRE)g_tf_fname.$(OBJEXT): g_tf_fname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h @@ -467,17 +468,15 @@ unix_glue.so unix_glue.po $(OUTPRE)unix_glue.$(OBJEXT): unix_glue.c $(SRCTOP)/in $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h klog.so klog.po $(OUTPRE)klog.$(OBJEXT): klog.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/kerberosIV/klog.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h log.so log.po $(OUTPRE)log.$(OBJEXT): log.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/kerberosIV/klog.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kntoln.so kntoln.po $(OUTPRE)kntoln.$(OBJEXT): kntoln.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h @@ -506,8 +505,8 @@ g_svc_in_tkt.so g_svc_in_tkt.po $(OUTPRE)g_svc_in_tkt.$(OBJEXT): g_svc_in_tkt.c krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): recvauth.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h ad_print.so ad_print.po $(OUTPRE)ad_print.$(OBJEXT): ad_print.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ @@ -518,7 +517,7 @@ cr_death_pkt.so cr_death_pkt.po $(OUTPRE)cr_death_pkt.$(OBJEXT): cr_death_pkt.c kparse.so kparse.po $(OUTPRE)kparse.$(OBJEXT): kparse.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/kerberosIV/kparse.h + $(SRCTOP)/include/kerberosIV/kparse.h $(BUILDTOP)/include/krb5/autoconf.h put_svc_key.so put_svc_key.po $(OUTPRE)put_svc_key.$(OBJEXT): put_svc_key.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ @@ -529,12 +528,12 @@ sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): sendauth.c $(SRCTOP)/includ krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h netread.so netread.po $(OUTPRE)netread.$(OBJEXT): netread.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h netwrite.so netwrite.po $(OUTPRE)netwrite.$(OBJEXT): netwrite.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h g_cnffile.so g_cnffile.po $(OUTPRE)g_cnffile.$(OBJEXT): g_cnffile.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/k5-int.h \ diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index 0f99a17..87aeebc 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -1,14 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -AC_C_CONST -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_CHECK_HEADERS(stdlib.h) - AC_TYPE_MODE_T AC_TYPE_UID_T -AC_DEFINE(KRB4_USE_KEYTAB) case $krb5_cv_host in powerpc-apple-darwin*) KRB_ERR_TXT= @@ -18,7 +11,6 @@ case $krb5_cv_host in ;; esac AC_SUBST([KRB_ERR_TXT]) -AC_CHECK_FUNCS(strdup seteuid setreuid setresuid) AC_PROG_AWK KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS diff --git a/src/lib/krb4/gethostname.c b/src/lib/krb4/gethostname.c index caff02e..c09be72 100644 --- a/src/lib/krb4/gethostname.c +++ b/src/lib/krb4/gethostname.c @@ -10,6 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include diff --git a/src/lib/krb4/getst.c b/src/lib/krb4/getst.c index ebcf54a..252571e 100644 --- a/src/lib/krb4/getst.c +++ b/src/lib/krb4/getst.c @@ -10,6 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/kadm_net.c b/src/lib/krb4/kadm_net.c index 781ec82..2ea4f37 100644 --- a/src/lib/krb4/kadm_net.c +++ b/src/lib/krb4/kadm_net.c @@ -31,6 +31,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/klog.c b/src/lib/krb4/klog.c index aa2b5f8..f0b8763 100644 --- a/src/lib/krb4/klog.c +++ b/src/lib/krb4/klog.c @@ -25,6 +25,7 @@ */ #include "krb.h" +#include "krb5/autoconf.h" #ifdef HAVE_TIME_H #include #endif diff --git a/src/lib/krb4/kparse.c b/src/lib/krb4/kparse.c index c60cbbc..94e5b93 100644 --- a/src/lib/krb4/kparse.c +++ b/src/lib/krb4/kparse.c @@ -38,6 +38,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_STDLIB_H #include #endif diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c index 615bd33..e2f6730 100644 --- a/src/lib/krb4/kuserok.c +++ b/src/lib/krb4/kuserok.c @@ -37,6 +37,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/log.c b/src/lib/krb4/log.c index 850cbfb..d7447ae 100644 --- a/src/lib/krb4/log.c +++ b/src/lib/krb4/log.c @@ -31,6 +31,7 @@ #endif #include "krb.h" +#include "krb5/autoconf.h" #ifdef HAVE_TIME_H #include #endif diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c index 65fbce4..6a7b48a 100644 --- a/src/lib/krb4/memcache.c +++ b/src/lib/krb4/memcache.c @@ -14,6 +14,7 @@ #include "krb.h" #include "krb4int.h" +#include "krb5/autoconf.h" #ifdef _WIN32 #include diff --git a/src/lib/krb4/mk_preauth.c b/src/lib/krb4/mk_preauth.c index 5295b22..342654a 100644 --- a/src/lib/krb4/mk_preauth.c +++ b/src/lib/krb4/mk_preauth.c @@ -15,6 +15,7 @@ #include "krb.h" #include +#include "krb5/autoconf.h" #ifdef HAVE_STDLIB_H #include #else diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c index 140bca3..87ead20 100644 --- a/src/lib/krb4/netread.c +++ b/src/lib/krb4/netread.c @@ -26,6 +26,7 @@ #include #include "krb.h" +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c index 18468db..1447b7c 100644 --- a/src/lib/krb4/netwrite.c +++ b/src/lib/krb4/netwrite.c @@ -26,6 +26,7 @@ #include #include "krb.h" +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c index d31b0a3..80561cc 100644 --- a/src/lib/krb4/put_svc_key.c +++ b/src/lib/krb4/put_svc_key.c @@ -28,6 +28,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c index 220fbd9..3d58a33 100644 --- a/src/lib/krb4/recvauth.c +++ b/src/lib/krb4/recvauth.c @@ -28,6 +28,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_STDLIB_H #include #endif diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index b740165..f9db288 100644 --- a/src/lib/krb4/send_to_kdc.c +++ b/src/lib/krb4/send_to_kdc.c @@ -30,6 +30,7 @@ #include #include #include +#include "krb5/autoconf.h" #ifdef HAVE_SYS_SELECT_H #include #endif diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c index 70eb60e..97a62d1 100644 --- a/src/lib/krb4/tkt_string.c +++ b/src/lib/krb4/tkt_string.c @@ -28,6 +28,7 @@ #include #include #include +#include "krb5/autoconf.h" #include "port-sockets.h" /* XXX this gets us MAXPATHLEN but we should find a better way */ -- cgit v1.1