mirror of
https://github.com/samba-team/samba.git
synced 2025-11-26 04:23:49 +03:00
s4-provision UTF16 encode the password in sam.ldb, not secrets.ldb
The password in secrets.ldb is UTF8, while clearTextPassword in
sam.ldb is UTF16.
This corrects commit bd5039546e, which
had these the wrong way around.
Andrew Bartlett
This commit is contained in:
@@ -830,7 +830,7 @@ def secretsdb_setup_dns(secretsdb, setup_path, names, private_dir,
|
||||
"REALM": realm,
|
||||
"DNSDOMAIN": dnsdomain,
|
||||
"DNS_KEYTAB": dns_keytab_path,
|
||||
"DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
|
||||
"DNSPASS_B64": b64encode(dnspass),
|
||||
"HOSTNAME": names.hostname,
|
||||
"DNSNAME" : '%s.%s' % (names.netbiosname.lower(), names.dnsdomain.lower())
|
||||
})
|
||||
@@ -1015,7 +1015,7 @@ def setup_self_join(samdb, names,
|
||||
setup_add_ldif(samdb, setup_path("provision_dns_add.ldif"), {
|
||||
"DNSDOMAIN": names.dnsdomain,
|
||||
"DOMAINDN": names.domaindn,
|
||||
"DNSPASS_B64": b64encode(dnspass),
|
||||
"DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
|
||||
"HOSTNAME" : names.hostname,
|
||||
"DNSNAME" : '%s.%s' % (names.netbiosname.lower(), names.dnsdomain.lower())
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user