diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-31 07:48:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-31 07:48:16 +1000 |
| commit | 337752cfd82dc3dbdf918fd45eddd1aa8fb04576 (patch) | |
| tree | 79aa04fbf294add814fb060f73a1909733b18ec4 /source4/auth/credentials/credentials_krb5.c | |
| parent | 2a0677e514b5b9f91d32339077cc7e4187525c3b (diff) | |
| parent | e45c3e127d389a2cb63879ca12bbbfed048f4eb1 (diff) | |
| download | samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.gz samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.bz2 samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 15d0951b74b46763024560f9cd012338473c5bc3)
Diffstat (limited to 'source4/auth/credentials/credentials_krb5.c')
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 12 |
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) { |