[SCM] Samba Shared Repository - branch master updated

[Garming Sam]

The branch, master has been updated
       via  7a3f97f selftest: fix envvars for creation of default user in wait_for_start
      from  a63aafb srcctl3: Improve debug messages

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7a3f97f2662c6197913aeb50e5e3c0c09ff8307f
Author: Jamie McClymont <jamiemcclymont at catalyst.net.nz>
Date:   Mon Jan 15 15:25:10 2018 +1300

    selftest: fix envvars for creation of default user in wait_for_start
    
    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 at catalyst.net.nz>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13225
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Tue Jan 16 07:12:01 CET 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm | 4 ++++
 1 file changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index f4ae0f3..f2dcdd1 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -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) {


-- 
Samba Shared Repository