sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

selftest: set wrapper env variables when running net groupmap

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Ralph Boehme 2018-01-08 14:28:40 +01:00
parent 53f709d6e0
commit 686fc4126d
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
selftest/target/Samba3.pm
View File

@ -2334,6 +2334,7 @@ sub wait_for_start($$$$$)
{ {
my ($self, $envvars, $nmbd, $winbindd, $smbd) = @_; my ($self, $envvars, $nmbd, $winbindd, $smbd) = @_;
my $cmd; my $cmd;
my $netcmd;
my $ret; my $ret;
if ($nmbd eq "yes") { if ($nmbd eq "yes") {
@ -2406,17 +2407,29 @@ sub wait_for_start($$$$$)
} }
# Ensure we have domain users mapped. # 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) { 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) { 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) { if ($ret != 0) {
return 1; print("\"$cmd\" failed\n");
return 1;
} }
# note: creating builtin groups requires winbindd for the # note: creating builtin groups requires winbindd for the