sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

selftest: Don't die() when the join fails

Browse Source 
This kills off everything without a proper shutdown, and is difficult
to debug.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-04-27 22:18:18 +10:00
parent fb5e1f4a65
commit b44f4325bb
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
selftest/target/Samba3.pm
View File

@ -178,7 +178,10 @@ sub setup_member($$$)
$cmd .= "$net join $ret->{CONFIGURATION} $s3dcvars->{DOMAIN} member";
$cmd .= " -U$s3dcvars->{USERNAME}\%$s3dcvars->{PASSWORD}";
system($cmd) == 0 or die("Join failed\n$cmd");
if (system($cmd) != 0) {
warn("Join failed\n$cmd");
return undef;
}
$self->check_or_start($ret, "yes", "yes", "yes");
@ -239,7 +242,10 @@ sub setup_admember($$$$)
$cmd .= "$net join $ret->{CONFIGURATION}";
$cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}";
system($cmd) == 0 or die("Join failed\n$cmd");
if (system($cmd) != 0) {
warn("Join failed\n$cmd");
return undef;
}
$self->check_or_start($ret,
"yes", "yes", "yes");
@ -251,10 +257,13 @@ sub setup_admember($$$$)
$cmd = "";
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
$cmd .= "$smbcacls //127.0.0.29/tmp / -U$ret->{USERNAME}%$ret->{PASSWORD} ";
$cmd .= "$ret->{CONFIGURATION} -S ACL:$dcvars->{DOMAIN}\\\\Domain\\ Users:ALLOWED/0x0/FULL";
$cmd .= "$smbcacls $ret->{CONFIGURATION} //127.0.0.29/tmp / -U$ret->{USERNAME}%$ret->{PASSWORD} ";
$cmd .= "-S ACL:$dcvars->{DOMAIN}\\\\Domain\\ Users:ALLOWED/0x0/FULL";
system($cmd) == 0 or die("Join failed\n$cmd");
if (system($cmd) != 0) {
warn("smbcacls failed\n$cmd");
return undef;
}
$ret->{DC_SERVER} = $dcvars->{SERVER};
$ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};