sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

provision: Decrease the length of random machine passwords

Browse Source 
The current length of 128-255 UTF-16 characters currently causes
generation of crypt() passwords to typically fail. This commit
decreases the length to 120 UTF-16 characters, which is the same as
that used by Windows.

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(similar to commit 609ca65765)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14984
This commit is contained in:
Joseph Sutton 2021-02-24 02:03:25 +13:00 committed by Jule Anger
parent 78d24902c7
commit 00aa1f8bba
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/join.py
View File

@ -136,7 +136,7 @@ class DCJoinContext(object):
if machinepass is not None:
ctx.acct_pass = machinepass
else:
ctx.acct_pass = samba.generate_random_machine_password(128, 255)
ctx.acct_pass = samba.generate_random_machine_password(120, 120)
ctx.dnsdomain = ctx.samdb.domain_dns_name()

2
python/samba/provision/__init__.py
View File

@ -1926,7 +1926,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
if krbtgtpass is None:
krbtgtpass = samba.generate_random_machine_password(128, 255)
if machinepass is None:
machinepass = samba.generate_random_machine_password(128, 255)
machinepass = samba.generate_random_machine_password(120, 120)
if dnspass is None:
dnspass = samba.generate_random_password(128, 255)

2
source4/libnet/libnet_vampire.c
View File

@ -164,7 +164,7 @@ NTSTATUS libnet_vampire_cb_prepare_db(void *private_data,
settings.realm = s->realm;
settings.domain = s->domain_name;
settings.server_dn_str = p->dest_dsa->server_dn_str;
settings.machine_password = generate_random_machine_password(s, 128, 255);
settings.machine_password = generate_random_machine_password(s, 120, 120);
settings.targetdir = s->targetdir;
settings.use_ntvfs = true;
status = provision_bare(s, s->lp_ctx, &settings, &result);

2
source4/scripting/bin/renamedc
View File

@ -95,7 +95,7 @@ if __name__ == '__main__':
# Then change password and samaccountname and dnshostname
msg = ldb.Message(newdn)
machinepass = samba.generate_random_machine_password(128, 255)
machinepass = samba.generate_random_machine_password(120, 120)
mputf16 = machinepass.encode('utf-16-le')
account = "%s$" % opts.newname.upper()