selftest: Make sure we have correct group mappings

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

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 6c86701273874fc6c753c0a49e718a9545124a9a..2b1752fb77dacf3db8bea3e7224bc4683bfb41d2 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2412,6 +2412,9 @@ sub wait_for_start($$$$$)
        $netcmd .= "NSS_WRAPPER_GROUP='$envvars->{NSS_WRAPPER_GROUP}' ";
        $netcmd .= Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} ";
 
+       $cmd = $netcmd . "groupmap delete ntgroup=domusers";
+       $ret = system($cmd);
+
        $cmd = $netcmd . "groupmap add rid=513 unixgroup=domusers type=domain";
        $ret = system($cmd);
        if ($ret != 0) {
@@ -2419,6 +2422,9 @@ sub wait_for_start($$$$$)
                return 1;
        }
 
+       $cmd = $netcmd . "groupmap delete ntgroup=domadmins";
+       $ret = system($cmd);
+
        $cmd = $netcmd . "groupmap add rid=512 unixgroup=domadmins type=domain";
        $ret = system($cmd);
        if ($ret != 0) {
@@ -2426,6 +2432,9 @@ sub wait_for_start($$$$$)
                return 1;
        }
 
+       $cmd = $netcmd . "groupmap delete ntgroup=everyone";
+       $ret = system($cmd);
+
        $cmd = $netcmd . "groupmap add sid=S-1-1-0 unixgroup=everyone type=builtin";
        $ret = system($cmd);
        if ($ret != 0) {