samba-tool/join_member: let py_net_join_member() choose the password
authorStefan Metzmacher <metze@samba.org>
Mon, 21 Feb 2022 14:03:22 +0000 (15:03 +0100)
committerJule Anger <janger@samba.org>
Mon, 7 Mar 2022 13:41:19 +0000 (13:41 +0000)
It means we'll let trust_pw_new_value() generate the password.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 59ac782452c4993274fa837256a8b9c5675e707b)

python/samba/netcmd/domain.py

index de6f2b0ca1d22933ed1d42e977c60012794bbe6a..a15e62acca641fe65a9840fb6ef6d0c8b5ec95d2 100644 (file)
@@ -688,8 +688,6 @@ class cmd_domain_join(Command):
                     os.rename(f.name, smb_conf)
                 s3_lp = s3param.get_context()
                 s3_lp.load(smb_conf)
-                if machinepass is None:
-                    machinepass = samba.generate_random_machine_password(14, 40)
                 s3_net = s3_Net(creds, s3_lp, server=server)
                 (sid, domain_name) = s3_net.join_member(netbios_name,
                                                         machinepass=machinepass,