From 2bf0e4224f85751fff4485e00e0d1fe13d5030bb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 18 Oct 2021 20:44:54 +1300 Subject: [PATCH] selftest: Remove duplicate setup of $base_dn and $ldbmodify 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 Reviewed-by: Stefan Metzmacher BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881 (cherry picked from commit 2c0658d408f17af2abc223b0cb18d8d33e0ecd1a) --- selftest/target/Samba4.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 99990fea2df..8bd489ea6a5 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -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"); -- 2.11.4.GIT