diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-10-02 22:50:10 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-10-02 22:50:10 +0000 |
| commit | 15d7eedfe654faaa6a74dea83b5d42b2cb626a03 (patch) | |
| tree | 36f8d7ed4a5bae1de61ed94b28c4e425e0724580 /src/aclocal.m4 | |
| parent | c6598e259d3ea25a67fd7a02ef0d2fa0ea6b3bd0 (diff) | |
| download | krb5-15d7eedfe654faaa6a74dea83b5d42b2cb626a03.zip krb5-15d7eedfe654faaa6a74dea83b5d42b2cb626a03.tar.gz krb5-15d7eedfe654faaa6a74dea83b5d42b2cb626a03.tar.bz2 | |
Merge Kevin Coffman's keyring ccache branch for Linux, with some modifications:
aclocal.m4: Enable keyring ccache if the header and library are available; no
configure-time option. No error if it's not found.
ccdefname.c: Keep old default of FILE: cache, at least for now.
libkrb5.exports: Don't export krb5_krcc_ops.
ccbase.c: Only initialize krb5int_krcc_mutex if USE_KEYRING_CCACHE; destroy it
in finalization. Define INITIAL_TYPEHEAD macro (for file vs keyring), and use
it for initialization and in krb5int_cc_finalize. Re-enable freeing of
additional registered-type structures.
cc_keyring.c: Avoid calls to com_err from within library.
cc_file.c: Punt change; generate_new is badly broken, and we expect to replace
it with a new API anyways.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18638 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 51ca472..c4ce88a 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -106,6 +106,7 @@ KRB5_LIB_PARAMS KRB5_AC_INITFINI KRB5_AC_ENABLE_THREADS KRB5_AC_FIND_DLOPEN +KRB5_AC_KEYRING_CCACHE ])dnl dnl Maintainer mode, akin to what automake provides, 'cept we don't @@ -1811,3 +1812,14 @@ dnl AC_MSG_NOTICE(disabling ldap backend module support) fi AC_SUBST(OPENLDAP_PLUGIN) ])dnl +dnl +dnl If libkeyutils exists (on Linux) include it and use keyring ccache +AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ + AC_CHECK_HEADERS([keyutils.h], + AC_CHECK_LIB(keyutils, add_key, + [dnl Pre-reqs were found + AC_DEFINE(USE_KEYRING_CCACHE, 1, [Define if the keyring ccache should be enabled]) + LIBS="-lkeyutils $LIBS" + ])) +])dnl +dnl |