diff options
| author | Tom Yu <tlyu@mit.edu> | 2006-06-14 22:27:54 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2006-06-14 22:27:54 +0000 |
| commit | 4c2bc7a022bff031e101a88363ff7756871e8721 (patch) | |
| tree | e2fcdfdbf65e10c6546068e54d832b4a4c237c70 /src/lib/gssapi/gss_libinit.c | |
| parent | c162f7fadad60a02fc35ba14d1b7e52f225460a4 (diff) | |
| download | krb5-4c2bc7a022bff031e101a88363ff7756871e8721.tar.gz krb5-4c2bc7a022bff031e101a88363ff7756871e8721.tar.xz krb5-4c2bc7a022bff031e101a88363ff7756871e8721.zip | |
Merge from branches/mechglue. Initial integration of Sun-donated
mechglue and SPNEGO implementations. Additional changes outside of
src/lib/gssapi:
* src/configure.in: Add lib/gssapi/mechglue and lib/gssapi/spnego
to list of directories to output Makefile in.
* src/lib/rpc/unit-test/rpc_test.0/expire.exp (expired): Update
regexp for mechglue.
* src/tests/dejagnu/krb-standalone/v4gssftp.exp (v4ftp_test):
Update "Miscellaneous failure" regexp for mechglue.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18131 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/gss_libinit.c')
| -rw-r--r-- | src/lib/gssapi/gss_libinit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c index f16359497..16031e26e 100644 --- a/src/lib/gssapi/gss_libinit.c +++ b/src/lib/gssapi/gss_libinit.c @@ -7,6 +7,8 @@ #include "gss_libinit.h" #include "k5-platform.h" +#include "mglueP.h" + /* * Initialize the GSSAPI library. */ @@ -26,6 +28,9 @@ int gssint_lib_init(void) add_error_table(&et_k5g_error_table); add_error_table(&et_ggss_error_table); #endif + err = gssint_mechglue_init(); + if (err) + return err; err = k5_mutex_finish_init(&gssint_krb5_keytab_lock); if (err) return err; @@ -61,6 +66,7 @@ void gssint_lib_fini(void) k5_mutex_destroy(&kg_vdb.mutex); k5_mutex_destroy(&kg_kdc_flag_mutex); k5_mutex_destroy(&gssint_krb5_keytab_lock); + gssint_mechglue_fini(); } OM_uint32 gssint_initialize_library (void) |