diff options
| author | Günther Deschner <gd@samba.org> | 2014-04-25 13:59:11 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-08-08 06:02:34 +0200 |
| commit | 3f7b80f691406aead96b1a0a9d1a168c5adb9ee6 (patch) | |
| tree | 9b9623ec4763d9aed9e31872b747d835874f28bf /source4/dsdb | |
| parent | 685af0342ea7324086661a506e1d0ee15ab07f16 (diff) | |
| download | samba-3f7b80f691406aead96b1a0a9d1a168c5adb9ee6.tar.gz samba-3f7b80f691406aead96b1a0a9d1a168c5adb9ee6.tar.xz samba-3f7b80f691406aead96b1a0a9d1a168c5adb9ee6.zip | |
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>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index f811463444..13c65c2794 100644 --- 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); |