selftest: fix envvars for creation of default user in wait_for_start
authorJamie McClymont <jamiemcclymont@catalyst.net.nz>
Mon, 15 Jan 2018 02:25:10 +0000 (15:25 +1300)
committerGarming Sam <garming@samba.org>
Tue, 16 Jan 2018 06:12:01 +0000 (07:12 +0100)
Resolves failure of ad_member to start up under ad_dc (if
the user is determined to be needed).

Signed-off-by: Jamie McClymont <jamiemcclymont@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13225

Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Tue Jan 16 07:12:01 CET 2018 on sn-devel-144

selftest/target/Samba3.pm

index f4ae0f3c02f44f0f03a9516d66acd7e26f87ad27..f2dcdd1489bac2ff4130f29013f24e0bf2017be9 100755 (executable)
@@ -2455,6 +2455,8 @@ sub wait_for_start($$$$$)
        }
        if ($create_builtin_users eq "yes") {
            $cmd = "SELFTEST_WINBINDD_SOCKET_DIR='$envvars->{SELFTEST_WINBINDD_SOCKET_DIR}' ";
+           $cmd .= "NSS_WRAPPER_PASSWD='$envvars->{NSS_WRAPPER_PASSWD}' ";
+           $cmd .= "NSS_WRAPPER_GROUP='$envvars->{NSS_WRAPPER_GROUP}' ";
            $cmd .= Samba::bindir_path($self, "net") . " $envvars->{CONFIGURATION} ";
            $cmd .= "sam createbuiltingroup Users";
            $ret = system($cmd);
@@ -2469,6 +2471,8 @@ sub wait_for_start($$$$$)
            system($cmd);
 
            $cmd = "SELFTEST_WINBINDD_SOCKET_DIR='$envvars->{SELFTEST_WINBINDD_SOCKET_DIR}' ";
+           $cmd .= "NSS_WRAPPER_PASSWD='$envvars->{NSS_WRAPPER_PASSWD}' ";
+           $cmd .= "NSS_WRAPPER_GROUP='$envvars->{NSS_WRAPPER_GROUP}' ";
            $cmd .= Samba::bindir_path($self, "wbinfo") . " --sid-to-gid=S-1-5-32-545";
            $ret = system($cmd);
            if ($ret != 0) {