From 63740c4e54727a7b2a40a46992f505c7d551f835 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Fri, 28 May 2004 03:44:33 +0000 Subject: [PATCH] Add prototypes for library init and fini functions. Makefile dependencies updated. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16371 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ChangeLog | 8 +++++++ src/lib/krb5/Makefile.in | 7 +++++- src/lib/krb5/ccache/ChangeLog | 8 +++++++ src/lib/krb5/ccache/Makefile.in | 2 +- src/lib/krb5/ccache/cc-int.h | 6 +++++ src/lib/krb5/ccache/ccbase.c | 1 + src/lib/krb5/keytab/ChangeLog | 8 +++++++ src/lib/krb5/keytab/Makefile.in | 2 +- src/lib/krb5/keytab/kt-int.h | 39 +++++++++++++++++++++++++++++++++ src/lib/krb5/keytab/ktbase.c | 1 + src/lib/krb5/krb5_libinit.c | 5 +++-- src/lib/krb5/rcache/ChangeLog | 7 ++++++ src/lib/krb5/rcache/Makefile.in | 2 +- src/lib/krb5/rcache/rc-int.h | 38 ++++++++++++++++++++++++++++++++ src/lib/krb5/rcache/rc_base.c | 1 + 15 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 src/lib/krb5/keytab/kt-int.h create mode 100644 src/lib/krb5/rcache/rc-int.h diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index d7de41df7..9b4cb7ae7 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,11 @@ +2004-05-27 Ezra Peisach + + * Makefile.in (LOCALINCLUDES): Include ccache, keytab and rcache + directories. + + * krb5_libinit.c: Include cc-int.h, kt-int.h, rc-int.h for + init/fini prototypes. + 2004-05-05 Ken Raeburn * libkrb5.exports: Export krb5int_foreach_localaddr for now. diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index b2468136a..274493316 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -2,6 +2,7 @@ thisconfigdir=. myfulldir=lib/krb5 mydir=. BUILDTOP=$(REL)..$(S).. +LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache posix ##DOSBUILDTOP = ..\.. @@ -134,5 +135,9 @@ krb5_libinit.so krb5_libinit.po $(OUTPRE)krb5_libinit.$(OBJEXT): krb5_libinit.c $(COM_ERR_DEPS) $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/krb5_err.h \ $(BUILDTOP)/include/kv5m_err.h $(BUILDTOP)/include/asn1_err.h \ $(BUILDTOP)/include/kdb5_err.h krb5_libinit.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-thread.h + $(SRCTOP)/include/k5-thread.h $(srcdir)/ccache/cc-int.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \ + $(srcdir)/keytab/kt-int.h $(srcdir)/rcache/rc-int.h diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 8a7e19f6c..0ae29ece0 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,10 @@ +2004-05-27 Ezra Peisach + + * ccbase.c: Include cc-int.h. + + * cc-int.h (krb5int_cc_finalize): Add prototypes for + krb5int_cc_{finalize,initialize}. + 2004-05-25 Jeffrey Altman * cc_mslsa.c: GetMSTGT(). Initialize pTicketRequest to NULL @@ -7,6 +14,7 @@ in the future. krb5_lcc_get_name(): fix return value if Kerberos is not supported. + 2004-05-24 Ezra Peisach * t_cc.c (cc_test): Clean up memory leaks in tests. diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 7a6cacaa2..4313e8d82 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -107,7 +107,7 @@ ccbase.so ccbase.po $(OUTPRE)ccbase.$(OBJEXT): ccbase.c $(SRCTOP)/include/k5-int $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/krb5/kdb.h fcc.h + $(SRCTOP)/include/krb5/kdb.h fcc.h cc-int.h cccopy.so cccopy.po $(OUTPRE)cccopy.$(OBJEXT): cccopy.c $(SRCTOP)/include/k5-int.h \ $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ diff --git a/src/lib/krb5/ccache/cc-int.h b/src/lib/krb5/ccache/cc-int.h index 48ee4fb52..d890cf6ba 100644 --- a/src/lib/krb5/ccache/cc-int.h +++ b/src/lib/krb5/ccache/cc-int.h @@ -36,4 +36,10 @@ krb5_boolean krb5int_cc_creds_match_request(krb5_context, krb5_flags whichfields, krb5_creds *mcreds, krb5_creds *creds); +int +krb5int_cc_initialize(void); + +void +krb5int_cc_finalize(void); + #endif /* __KRB5_CCACHE_H__ */ diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index f635147c2..d685ae14f 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -31,6 +31,7 @@ #include "k5-thread.h" #include "fcc.h" +#include "cc-int.h" struct krb5_cc_typelist { const krb5_cc_ops *ops; diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index 48855a6b7..88a97a9a0 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,11 @@ +2004-05-27 Ezra Peisach + + * ktbase.c: Include kt-int.h + + * kt-int.h: Create file with prototypes for krb5int_kt_initialize and + krb5int_kt_finalize(void); + + 2004-04-24 Ken Raeburn * ktbase.c: Include ctype.h. diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index e6833818b..0625cd9f8 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -72,7 +72,7 @@ ktbase.so ktbase.po $(OUTPRE)ktbase.$(OBJEXT): ktbase.c $(SRCTOP)/include/k5-int $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/krb5/kdb.h + $(SRCTOP)/include/krb5/kdb.h kt-int.h ktdefault.so ktdefault.po $(OUTPRE)ktdefault.$(OBJEXT): ktdefault.c $(SRCTOP)/include/k5-int.h \ $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ diff --git a/src/lib/krb5/keytab/kt-int.h b/src/lib/krb5/keytab/kt-int.h new file mode 100644 index 000000000..23bbc5505 --- /dev/null +++ b/src/lib/krb5/keytab/kt-int.h @@ -0,0 +1,39 @@ +/* + * lib/krb5/keytab/kt-int.h + * + * Copyright 2004 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * + * This file contains constant and function declarations used in the + * file-based credential cache routines. + */ + +#ifndef __KRB5_KEYTAB_INT_H__ +#define __KRB5_KEYTAB_INT_H__ + + +int krb5int_kt_initialize(void); + +void krb5int_kt_finalize(void); + +#endif /* __KRB5_KEYTAB_INT_H__ */ diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index 74ff20cf6..e633c0c3a 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -29,6 +29,7 @@ #include "k5-int.h" #include "k5-thread.h" +#include "kt-int.h" extern const krb5_kt_ops krb5_ktf_ops; extern const krb5_kt_ops krb5_ktf_writable_ops; diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index 6b7bf23ef..ce3c08ee7 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -14,6 +14,9 @@ #include "krb5_libinit.h" #include "k5-platform.h" +#include "cc-int.h" +#include "kt-int.h" +#include "rc-int.h" static int initialized = 0; @@ -43,8 +46,6 @@ int krb5int_lib_init(void) /* Always-delayed initialization -- error table linkage, etc. */ krb5_error_code krb5int_initialize_library (void) { - int err; - if (!initialized) { #if !USE_BUNDLE_ERROR_STRINGS add_error_table(&et_krb5_error_table); diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index b2c49135c..2b4b65da2 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,10 @@ +2004-05-27 Ezra Peisach + + * rc_base.c: Include rc-int.h + + * rc-int.h: Create file with prototypes for krb5int_rc_finish_init and + krb5int_rc_terminate. + 2004-05-24 Ezra Peisach * rc_io.c (krb5_rc_io_open_internal): If file could not be open, diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 21d396072..3f753d4f9 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -51,7 +51,7 @@ rc_base.so rc_base.po $(OUTPRE)rc_base.$(OBJEXT): rc_base.c rc_base.h $(SRCTOP)/ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/krb5/kdb.h + $(SRCTOP)/include/krb5/kdb.h rc-int.h rc_dfl.so rc_dfl.po $(OUTPRE)rc_dfl.$(OBJEXT): rc_dfl.c rc_base.h $(SRCTOP)/include/k5-int.h \ $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ diff --git a/src/lib/krb5/rcache/rc-int.h b/src/lib/krb5/rcache/rc-int.h new file mode 100644 index 000000000..613d7e9f1 --- /dev/null +++ b/src/lib/krb5/rcache/rc-int.h @@ -0,0 +1,38 @@ +/* + * lib/krb5/keytab/rc-int.h + * + * Copyright 2004 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * + * This file contains constant and function declarations used in the + * file-based credential cache routines. + */ + +#ifndef __KRB5_RCACHE_INT_H__ +#define __KRB5_RCACHE_INT_H__ + +int krb5int_rc_finish_init(void); + +void krb5int_rc_terminate(void); + +#endif /* __KRB5_RCACHE_INT_H__ */ diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c index bde942a5d..4146cc8d6 100644 --- a/src/lib/krb5/rcache/rc_base.c +++ b/src/lib/krb5/rcache/rc_base.c @@ -12,6 +12,7 @@ */ #include "rc_base.h" +#include "rc-int.h" #include "k5-thread.h" #define FREE(x) ((void) free((char *) (x))) -- 2.26.2