summaryrefslogtreecommitdiffstats
path: root/src/lib/gssapi/krb5
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-06-21 16:53:43 -0400
committerGreg Hudson <ghudson@mit.edu>2012-06-21 16:53:43 -0400
commitf22b98916070be6b3778888df1e65ced07c47131 (patch)
tree71a0b0c23a64ea50e0011538c813ef57c2b788ab /src/lib/gssapi/krb5
parent37b09d45192bd9d958d047dbb829d10f892b1fda (diff)
downloadkrb5-f22b98916070be6b3778888df1e65ced07c47131.tar.gz
krb5-f22b98916070be6b3778888df1e65ced07c47131.tar.xz
krb5-f22b98916070be6b3778888df1e65ced07c47131.zip
Remove orphaned KfM code
Diffstat (limited to 'src/lib/gssapi/krb5')
-rw-r--r--src/lib/gssapi/krb5/acquire_cred.c65
1 files changed, 2 insertions, 63 deletions
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index a784dd37d9..d7daecb227 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -78,10 +78,7 @@
#include <strings.h>
#endif
-#if defined(USE_KIM)
-#include <kim/kim.h>
-#include "kim_library_private.h"
-#elif defined(USE_LEASH)
+#ifdef USE_LEASH
#ifdef _WIN64
#define LEASH_DLL "leashw64.dll"
#else
@@ -270,62 +267,6 @@ acquire_accept_cred(krb5_context context,
}
#endif /* LEAN_CLIENT */
-#ifdef USE_KIM
-krb5_error_code
-get_ccache_kim(krb5_context context, krb5_principal desired_princ,
- krb5_ccache *ccache_out)
-{
- kim_error err;
- kim_ccache kimccache = NULL;
- kim_identity identity = NULL;
- kim_credential_state state;
- krb5_ccache ccache;
-
- *ccache_out = NULL;
-
- err = kim_identity_create_from_krb5_principal(&identity, context,
- desired_princ);
- if (err)
- goto cleanup;
-
- err = kim_ccache_create_from_client_identity(&kimccache, identity);
- if (err)
- goto cleanup;
-
- err = kim_ccache_get_state(kimccache, &state);
- if (err)
- goto cleanup;
-
- if (state != kim_credentials_state_valid) {
- if (state == kim_credentials_state_needs_validation) {
- err = kim_ccache_validate(kimccache, KIM_OPTIONS_DEFAULT);
- if (err)
- goto cleanup;
- } else {
- kim_ccache_free(&kimccache);
- }
- }
-
- if (!kimccache && kim_library_allow_automatic_prompting()) {
- /* ccache does not already exist, create a new one. */
- err = kim_ccache_create_new(&kimccache, identity, KIM_OPTIONS_DEFAULT);
- if (err)
- goto cleanup;
- }
-
- err = kim_ccache_get_krb5_ccache(kimccache, context, &ccache);
- if (err)
- goto cleanup;
-
- *ccache_out = ccache;
-
-cleanup:
- kim_ccache_free(&kimccache);
- kim_identity_free(&identity);
- return err;
-}
-#endif /* USE_KIM */
-
#ifdef USE_LEASH
static krb5_error_code
get_ccache_leash(krb5_context context, krb5_principal desired_princ,
@@ -575,9 +516,7 @@ acquire_init_cred(krb5_context context,
code = krb5int_cc_default(context, &ccache);
} else if (desired_princ) {
/* Try to find an appropriate ccache for the desired name. */
-#if defined(USE_KIM)
- code = get_ccache_kim(context, desired_princ, &ccache);
-#elif defined(USE_LEASH)
+#ifdef USE_LEASH
code = get_ccache_leash(context, desired_princ, &ccache);
#else
code = krb5_cc_cache_match(context, desired_princ, &ccache);