Move gmt_mktime.c from lib/krb5/os to util/support, and rename the function.

Stop exporting gmt_mktime from libkrb5, and export krb5int_gmt_mktime from
libkrb5support.  Updated the one caller, asn1_decode.c.

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index dcb13af5c8d6c226dd079a8708f48560723ce438..d80db9dc7723aadc14c84ee46417de10d8c8736e 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -749,7 +749,7 @@ krb5_error_code krb5_crypto_us_timeofday
        (krb5_int32 *,
                krb5_int32 *);
 
-time_t gmt_mktime (struct tm *);
+time_t krb5int_gmt_mktime (struct tm *);
 
 #endif /* KRB5_OLD_CRYPTO */
 

diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index d31ce3e3b160c7e914f4be603a7a05590fdc612d..aa4be3263c8f8cdb4eda4c30221e9d0a72f9f66d 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -55,7 +55,7 @@ if(asn1class != UNIVERSAL || construction != PRIMITIVE || tagnum != type)\
 #define cleanup()\
 return 0
 
-time_t gmt_mktime (struct tm *);
+extern time_t krb5int_gmt_mktime (struct tm *);
 
 asn1_error_code asn1_decode_integer(asn1buf *buf, long int *val)
 {
@@ -250,7 +250,7 @@ asn1_error_code asn1_decode_generaltime(asn1buf *buf, time_t *val)
   ts.tm_min = 10*c2i(s[10]) + c2i(s[11]);
   ts.tm_sec = 10*c2i(s[12]) + c2i(s[13]);
   ts.tm_isdst = -1;
-  t = gmt_mktime(&ts);
+  t = krb5int_gmt_mktime(&ts);
   free(s);
 
   if(t == -1) return ASN1_BAD_TIMEFORMAT;

diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 8831bf78151c1200df14ebd7d88d8462a4fcd982..afd7846f780bd8ff57ed43f673257ef2ba354d0d 100644 (file)
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -239,7 +239,6 @@ et_kdb5_error_table
 et_krb5_error_table
 et_kv5m_error_table
 et_prof_error_table
-gmt_mktime
 initialize_asn1_error_table
 initialize_k524_error_table
 initialize_kdb5_error_table

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 55ea53a02982fbdc0c418eaff3963ebbddc89002..eab550d55179b5f3a2e680a0fdf858d35c62d42a 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -28,7 +28,6 @@ STLIBOBJS= \
        gen_port.o      \
        genaddrs.o      \
        gen_rname.o     \
-       gmt_mktime.o    \
        hostaddr.o      \
        hst_realm.o     \
        init_os_ctx.o   \
@@ -74,7 +73,6 @@ OBJS= \
        $(OUTPRE)gen_port.$(OBJEXT)     \
        $(OUTPRE)genaddrs.$(OBJEXT)     \
        $(OUTPRE)gen_rname.$(OBJEXT)    \
-       $(OUTPRE)gmt_mktime.$(OBJEXT)   \
        $(OUTPRE)hostaddr.$(OBJEXT)     \
        $(OUTPRE)hst_realm.$(OBJEXT)    \
        $(OUTPRE)init_os_ctx.$(OBJEXT)  \
@@ -120,7 +118,6 @@ SRCS= \
        $(srcdir)/gen_port.c    \
        $(srcdir)/genaddrs.c    \
        $(srcdir)/gen_rname.c   \
-       $(srcdir)/gmt_mktime.c  \
        $(srcdir)/hostaddr.c    \
        $(srcdir)/hst_realm.c   \
        $(srcdir)/init_os_ctx.c \
@@ -180,9 +177,6 @@ t_an_to_ln: $(T_AN_TO_LN_OBJS) $(KRB5_BASE_DEPLIBS)
 t_realm_iter: $(T_REALM_ITER_OBJS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_realm_iter $(T_REALM_ITER_OBJS) $(KRB5_BASE_LIBS)
 
-t_mktime: gmt_mktime.c
-       $(CC) $(ALL_CFLAGS) -DTEST_LEAP -o t_mktime $(srcdir)/gmt_mktime.c
-
 t_localaddr: localaddr.c
        $(CC_LINK) $(ALL_CFLAGS) -DTEST -o t_localaddr $(srcdir)/localaddr.c $(KRB5_BASE_LIBS) $(LIBS)
 
@@ -372,14 +366,6 @@ gen_rname.so gen_rname.po $(OUTPRE)gen_rname.$(OBJEXT): \
   $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
   gen_rname.c os-proto.h
-gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-int.h \
-  $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  gmt_mktime.c
 hostaddr.so hostaddr.po $(OUTPRE)hostaddr.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \

diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 5217cd72c6a4398a91d64259f10e8d69d46f0489..4b0ea81bb684b0cfe38e1edeeb5698b141706f9b 100644 (file)
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -30,6 +30,7 @@ STLIBOBJS= \
        init-addrinfo.o \
        plugins.o \
        errors.o \
+       gmt_mktime.o \
        fake-addrinfo.o
 
 LIBOBJS= \
@@ -37,6 +38,7 @@ LIBOBJS= \
        $(OUTPRE)init-addrinfo.$(OBJEXT) \
        $(OUTPRE)plugins.$(OBJEXT) \
        $(OUTPRE)errors.$(OBJEXT) \
+       $(OUTPRE)gmt_mktime.$(OBJEXT) \
        $(OUTPRE)fake-addrinfo.$(OBJEXT)
 
 STOBJLISTS=OBJS.ST
@@ -49,6 +51,7 @@ SRCS=\
        $(srcdir)/threads.c \
        $(srcdir)/init-addrinfo.c \
        $(srcdir)/errors.c \
+       $(srcdir)/gmt_mktime.c \
        $(srcdir)/fake-addrinfo.c
 SHLIB_EXPDEPS =
 # Add -lm if dumping thread stats, for sqrt.
@@ -70,6 +73,9 @@ $(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in
        (cd $(BUILDTOP)/include; $(MAKE) autoconf.h)
 ##DOS##!endif
 
+t_mktime: gmt_mktime.c
+       $(CC) $(ALL_CFLAGS) -DTEST_LEAP -o t_mktime $(srcdir)/gmt_mktime.c
+
 # @lib_frag@
 # @libobj_frag@
 
@@ -90,6 +96,8 @@ init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \
 errors.so errors.po $(OUTPRE)errors.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-platform.h \
   $(SRCTOP)/include/k5-thread.h errors.c
+gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h gmt_mktime.c
 fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
   $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \

diff --git a/src/lib/krb5/os/gmt_mktime.c b/src/util/support/gmt_mktime.c
similarity index 97%
rename from src/lib/krb5/os/gmt_mktime.c
rename to src/util/support/gmt_mktime.c
index 3d10e1a4e6bc8fe2b1381c590fc175773670991b..65ab87349bdff6d5ace1df929103507264e93c95 100644 (file)
--- a/src/lib/krb5/os/gmt_mktime.c
+++ b/src/util/support/gmt_mktime.c
@@ -1,7 +1,7 @@
 /* This code placed in the public domain by Mark W. Eichin */
 
 #include <stdio.h>
-#include "k5-int.h"
+#include "autoconf.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -36,7 +36,7 @@ static const int days_in_month[12] = {
 
 #define hasleapday(year) (year%400?(year%100?(year%4?0:1):0):1)
 
-time_t gmt_mktime(struct tm *t)
+time_t krb5int_gmt_mktime(struct tm *t)
 {
   time_t accum;
 

diff --git a/src/util/support/libkrb5support.exports b/src/util/support/libkrb5support.exports
index 00ce5c3e3c35e5325f20c147d317c63278d4faaa..a7b6c1c981707e499b75360b1ab1854051552cba 100644 (file)
--- a/src/util/support/libkrb5support.exports
+++ b/src/util/support/libkrb5support.exports
@@ -31,3 +31,4 @@ krb5int_get_error
 krb5int_free_error
 krb5int_clear_error
 krb5int_set_error_info_callout_fn
+krb5int_gmt_mktime