From aa2c6f469414668e56aa03d5ba5cecde64bc713e Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 6 Jul 2012 19:06:48 +0200 Subject: Revert commit 4c157ecedd52602f75574605ef48d0c48e9bfbe8 * This broke corner cases when used with default_tkt_types = des-cbc-crc and DES enabled on an AD domain. * This is fixed in kerberos instead, in a more correct way and in a way which we cannot replicate. --- src/providers/krb5/krb5_child.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/providers/krb5/krb5_child.c') diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index 091538fb..86050d16 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -803,14 +803,6 @@ static krb5_error_code get_and_save_tgt_with_keytab(krb5_context ctx, krb5_error_code kerr = 0; krb5_creds creds; krb5_get_init_creds_opt options; - krb5_enctype *etype_list; - krb5_error_code krberr; - TALLOC_CTX *tmp_ctx; - int n_etype_list; - - tmp_ctx = talloc_new(NULL); - if (tmp_ctx == NULL) - return ENOMEM; memset(&creds, 0, sizeof(creds)); memset(&options, 0, sizeof(options)); @@ -820,18 +812,6 @@ static krb5_error_code get_and_save_tgt_with_keytab(krb5_context ctx, krb5_get_init_creds_opt_set_proxiable(&options, 0); krb5_set_canonicalize(&options); - krberr = sss_krb5_read_etypes_for_keytab(tmp_ctx, ctx, keytab, princ, - &etype_list, &n_etype_list); - if (krberr) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to load etypes from keytab: %s\n", - sss_krb5_get_error_message(ctx, krberr))); - } else if (n_etype_list > 0) { - krb5_get_init_creds_opt_set_etype_list(&options, etype_list, - n_etype_list); - DEBUG(SSSDBG_FUNC_DATA, ("Loaded %d enctypes from keytab\n", - n_etype_list)); - } - kerr = krb5_get_init_creds_keytab(ctx, &creds, princ, keytab, 0, NULL, &options); if (kerr != 0) { @@ -849,7 +829,6 @@ static krb5_error_code get_and_save_tgt_with_keytab(krb5_context ctx, done: krb5_free_cred_contents(ctx, &creds); - talloc_free(tmp_ctx); return kerr; -- cgit