]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:passdb: Make sure the salt is fully initialized before passing
authorAndreas Schneider <asn@samba.org>
Wed, 25 Oct 2017 17:50:57 +0000 (19:50 +0200)
committerKarolin Seeger <kseeger@samba.org>
Thu, 2 Nov 2017 12:01:22 +0000 (13:01 +0100)
Otherwise the magic member is not initialized.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13101

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 5274beba4cf722a34403dc07bf287815a6df6281)

source3/passdb/machine_account_secrets.c

index fbc87c5619c21eec4674fed2597d52e04f437ab1..75f31cb04e2e8e049757468edb67ab8a83b28033 100644 (file)
@@ -1090,8 +1090,10 @@ static int secrets_domain_info_kerberos_keys(struct secrets_domain_info1_passwor
                return krb5_ret;
        }
 
-       salt.data = discard_const(salt_data);
-       salt.length = strlen(salt_data);
+       salt = (krb5_data) {
+               .data = discard_const(salt_data),
+               .length = strlen(salt_data),
+       };
 
        ok = convert_string_talloc(keys, CH_UTF16MUNGED, CH_UTF8,
                                   p->cleartext_blob.data,