]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
CVE-2020-25717 selftest: Only set netbios aliases for the ad_member env
authorAndreas Schneider <asn@samba.org>
Thu, 10 Jun 2021 14:20:28 +0000 (16:20 +0200)
committerJule Anger <janger@samba.org>
Mon, 8 Nov 2021 09:52:09 +0000 (10:52 +0100)
The provision_ad_member() function is reused by different
setup_ad_member*() functions. Each environment needs to have unique
netbios aliases as they are all in the same network.
The aliases should only be set for the 'ad_member' environment.

Signed-Off-By: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jun 11 01:26:36 UTC 2021 on sn-devel-184

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

(cherry picked from commit e165dcc770ec58c3749d653d6cb85f6ecf9479d6)

selftest/target/Samba3.pm

index 6abec28d86287bca744ca9d4400702c02c17fb44..9481d18961623e86f36af7879e711196a18398bd 100755 (executable)
@@ -684,11 +684,17 @@ sub provision_ad_member
        $substitution_path = "$share_dir/D_$dcvars->{DOMAIN}/u_$dcvars->{DOMAIN}/alice/g_$dcvars->{DOMAIN}/domain users";
        push(@dirs, $substitution_path);
 
+
+       my $netbios_aliases = "";
+       if ($machine_account eq "LOCALADMEMBER") {
+               $netbios_aliases = "netbios aliases = foo bar";
+       }
+
        my $member_options = "
        security = ads
         workgroup = $dcvars->{DOMAIN}
         realm = $dcvars->{REALM}
-        netbios aliases = foo bar
+        $netbios_aliases
        template homedir = /home/%D/%G/%U
        auth event notification = true
        password server = $dcvars->{SERVER}