summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-07-28 18:39:37 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-28 18:39:37 +1000
commitade9b6c455518c8bc1b49cb6fe87aa6de7b36868 (patch)
treecdd5c76c7dde8daa5d406da2cd3dc4124837c875
parentda9ab5756e1256a9c6e1188f7510ca5d84cbe4f9 (diff)
parent0299edbc02f4185020bae8e66c02d1081d07279f (diff)
downloadsamba-ade9b6c455518c8bc1b49cb6fe87aa6de7b36868.tar.gz
samba-ade9b6c455518c8bc1b49cb6fe87aa6de7b36868.tar.bz2
samba-ade9b6c455518c8bc1b49cb6fe87aa6de7b36868.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 486891bb5167034e54b7477ba09e8f5f914b93e4)
-rw-r--r--source4/auth/credentials/credentials_krb5.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c
index c4c58398c3..1a2d5faddd 100644
--- a/source4/auth/credentials/credentials_krb5.c
+++ b/source4/auth/credentials/credentials_krb5.c
@@ -392,7 +392,17 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
return ret;
}
- /* transfer the enctypes from the smb_krb5_context to the gssapi layer */
+ /*
+ * transfer the enctypes from the smb_krb5_context to the gssapi layer
+ *
+ * We use 'our' smb_krb5_context to do the AS-REQ and it is possible
+ * to configure the enctypes via the krb5.conf.
+ *
+ * And the gss_init_sec_context() creates it's own krb5_context and
+ * the TGS-REQ had all enctypes in it and only the ones configured
+ * and used for the AS-REQ, so it wasn't possible to disable the usage
+ * of AES keys.
+ */
min_stat = krb5_get_default_in_tkt_etypes(ccache->smb_krb5_context->krb5_context,
&etypes);
if (min_stat == 0) {