diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2021-02-24 02:03:25 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-04-07 09:18:30 +0000 |
| commit | 609ca657652862fd9c81fd11f818efb74f72ff55 (patch) | |
| tree | 0e376202d84d5d194ec25988955eadb330edb6a9 /python | |
| parent | 88b3d3443b3a581ec301430346b3e9bf05d81b5e (diff) | |
| download | samba-609ca657652862fd9c81fd11f818efb74f72ff55.tar.gz | |
provision: Decrease the length of random machine passwords
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>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/join.py | 2 | ||||
| -rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
| -rw-r--r-- | python/samba/tests/samba_tool/provision_userPassword_crypt.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/python/samba/join.py b/python/samba/join.py index 28698e1744c..d78375441fb 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -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() diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index b87ad38eeff..2531f51ffc8 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1925,7 +1925,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) diff --git a/python/samba/tests/samba_tool/provision_userPassword_crypt.py b/python/samba/tests/samba_tool/provision_userPassword_crypt.py index 234daba3064..32205b6b9f9 100644 --- a/python/samba/tests/samba_tool/provision_userPassword_crypt.py +++ b/python/samba/tests/samba_tool/provision_userPassword_crypt.py @@ -55,7 +55,7 @@ class ProvisionUserPasswordTestCase(SambaToolCmdTest): return self.run_command(command) def test_crypt(self): - (result, out, err) = self.provision("FooBar123") + (result, out, err) = self.provision() self.assertEqual(0, result) def tearDown(self): |