s4:kdc/db-glue: samba_kdc_trust_message2entry() should use the normalized principal...

smbclient //w2012r2-183.w2012r2-l4.base/netlogon -c 'ls' -k yes -Uadministrator@S4XDOM.BASE%A1b2C3d4
worked while
smbclient //w2012r2-183.w2012r2-l4.base/netlogon -c 'ls' -k yes -Uadministrator@s4xdom.base
failed, if aes keys are used across the trust.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Fri Mar 27 04:02:05 CET 2015 on sn-devel-104

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 0cec8fb57f43a852b570afe6253cbac10ca75d0e..4237c65d873999add855473b379f0eeb7392d734 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1228,7 +1228,7 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
 
        if (password_utf8.length != 0) {
                Key key = {};
-               krb5_const_principal salt_principal = principal;
+               krb5_const_principal salt_principal = entry_ex->entry.principal;
                krb5_data salt;
                krb5_data cleartext_data;