]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
selftest: Remove duplicate setup of $base_dn and $ldbmodify
authorAndrew Bartlett <abartlet@samba.org>
Mon, 18 Oct 2021 07:44:54 +0000 (20:44 +1300)
committerStefan Metzmacher <metze@samba.org>
Wed, 27 Oct 2021 22:37:10 +0000 (22:37 +0000)
These are already set up to the same values above for the full
DC and correct values for the (strange) s4member environment.

By not setting $base_dn again we avoid an error once we start
checking for them.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881
(cherry picked from commit 2c0658d408f17af2abc223b0cb18d8d33e0ecd1a)

selftest/target/Samba4.pm

index 99990fea2df9b839729cc22dac24962d9da9afa0..8bd489ea6a5526fdaa6aa7cc9615f0b6d3130eb2 100755 (executable)
@@ -1108,10 +1108,6 @@ servicePrincipalName: http/testupnspn.$ctx->{dnsname}
        }
 
        # Change the userPrincipalName for jane
-       $ldbmodify = ${cmd_env};
-       $ldbmodify .= Samba::bindir_path($self, "ldbmodify");
-       $ldbmodify .=  " --configfile=$ctx->{smb_conf}";
-       $base_dn = "DC=".join(",DC=", split(/\./, $ctx->{realm}));
        $user_dn = "cn=jane,cn=users,$base_dn";
 
        open(LDIF, "|$ldbmodify -H $ctx->{privatedir}/sam.ldb");