s4-dsdb/samdb: use smb_krb5_make_principal for compatibility reasons with MIT.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index f8114634441f85d6780e7c3ed58f9434d70e618e..13c65c2794b37db012ef8761c7655a6b1291006e 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -43,6 +43,7 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "../lib/crypto/crypto.h"
 #include "param/param.h"
+#include "lib/krb5_wrap/krb5_samba.h"
 
 /* If we have decided there is a reason to work on this request, then
  * setup all the password hash types correctly.
@@ -645,7 +646,7 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
 {
        struct ldb_context *ldb;
        krb5_error_code krb5_ret;
-       Principal *salt_principal;
+       krb5_principal salt_principal;
        krb5_salt salt;
        krb5_keyblock key;
        krb5_data cleartext_data;
@@ -680,7 +681,7 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
                        return ldb_oom(ldb);
                }
                
-               krb5_ret = krb5_make_principal(io->smb_krb5_context->krb5_context,
+               krb5_ret = smb_krb5_make_principal(io->smb_krb5_context->krb5_context,
                                               &salt_principal,
                                               io->ac->status->domain_data.realm,
                                               "host", saltbody, NULL);
@@ -698,12 +699,12 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io)
                        p[0] = '\0';
                }
 
-               krb5_ret = krb5_make_principal(io->smb_krb5_context->krb5_context,
+               krb5_ret = smb_krb5_make_principal(io->smb_krb5_context->krb5_context,
                                               &salt_principal,
                                               io->ac->status->domain_data.realm,
                                               user_principal_name, NULL);
        } else {
-               krb5_ret = krb5_make_principal(io->smb_krb5_context->krb5_context,
+               krb5_ret = smb_krb5_make_principal(io->smb_krb5_context->krb5_context,
                                               &salt_principal,
                                               io->ac->status->domain_data.realm,
                                               io->u.sAMAccountName, NULL);