From 686fc4126dc5b69d34e71f7d014c3c17ba0f649e Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 8 Jan 2018 14:28:40 +0100 Subject: [PATCH] selftest: set wrapper env variables when running net groupmap Signed-off-by: Ralph Boehme Reviewed-by: Andreas Schneider --- selftest/target/Samba3.pm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 2c2e8f99356..df96fd18f55 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -2334,6 +2334,7 @@ sub wait_for_start($$$$$) { my ($self, $envvars, $nmbd, $winbindd, $smbd) = @_; my $cmd; + my $netcmd; my $ret; if ($nmbd eq "yes") { @@ -2406,17 +2407,29 @@ sub wait_for_start($$$$$) } # Ensure we have domain users mapped. - $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain"); + $netcmd = "NSS_WRAPPER_PASSWD='$envvars->{NSS_WRAPPER_PASSWD}' "; + $netcmd .= "NSS_WRAPPER_GROUP='$envvars->{NSS_WRAPPER_GROUP}' "; + $netcmd .= Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} "; + + $cmd = $netcmd . "groupmap add rid=513 unixgroup=domusers type=domain"; + $ret = system($cmd); if ($ret != 0) { - return 1; + print("\"$cmd\" failed\n"); + return 1; } - $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add rid=512 unixgroup=domadmins type=domain"); + + $cmd = $netcmd . "groupmap add rid=512 unixgroup=domadmins type=domain"; + $ret = system($cmd); if ($ret != 0) { - return 1; + print("\"$cmd\" failed\n"); + return 1; } - $ret = system(Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} groupmap add sid=S-1-1-0 unixgroup=everyone type=builtin"); + + $cmd = $netcmd . "groupmap add sid=S-1-1-0 unixgroup=everyone type=builtin"; + $ret = system($cmd); if ($ret != 0) { - return 1; + print("\"$cmd\" failed\n"); + return 1; } # note: creating builtin groups requires winbindd for the -- 2.47.3