diff options
author | Stefan Metzmacher <metze@samba.org> | 2019-09-13 16:04:30 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2019-09-25 23:37:32 +0000 |
commit | be9ea381530329c9641ac3858d5c52bfefef06ff (patch) | |
tree | 690db88558e6ee46ec59850b7eec7dd2963fe2b2 /lib | |
parent | 03477632b620d883247ae8c46876cc99879fbaea (diff) | |
download | samba-be9ea381530329c9641ac3858d5c52bfefef06ff.tar.gz |
krb5_wrap: smb_krb5_kinit_password_ccache() should always use the canonicalized principal
We should always use krb5_get_init_creds_opt_set_canonicalize()
and krb5_get_init_creds_opt_set_win2k() for heimdal
and expect the client principal to be changed.
There's no reason to have a different logic between MIT and Heimdal.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit 5d0bf32ec0ad21d49587e3a1520ffdc8b5ae7614)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index f0dc86b1859..a63159812e1 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -2111,14 +2111,12 @@ krb5_error_code smb_krb5_kinit_password_ccache(krb5_context ctx, return code; } -#ifndef SAMBA4_USES_HEIMDAL /* MIT */ /* * We need to store the principal as returned from the KDC to the * credentials cache. If we don't do that the KRB5 library is not * able to find the tickets it is looking for */ principal = my_creds.client; -#endif code = krb5_cc_initialize(ctx, cc, principal); if (code) { goto done; |