$option = "client" if $option eq "";
- if ($envname eq "none") {
- $testenv_vars = {};
- } elsif (defined(get_running_env($envname))) {
+ if (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $testenv_vars->{target}->check_env($testenv_vars)) {
print $testenv_vars->{target}->getlog_env($testenv_vars);
sub check_env($)
{
my ($envname) = @_;
- return 1 if ($envname eq "none");
my $env = get_running_env($envname);
return $env->{target}->check_env($env);
}
sub check_env($$)
{
my ($self, $envvars) = @_;
+ my $samba_pid = $envvars->{SAMBA_PID};
- my $childpid = Samba::cleanup_child($envvars->{SAMBA_PID}, "samba");
+ return 1 if $samba_pid == -1;
+
+ my $childpid = Samba::cleanup_child($samba_pid, "samba");
return ($childpid == 0);
}
}
return $target3->setup_admember_rfc2307("$path/ad_member_rfc2307",
$self->{vars}->{ad_dc_ntvfs}, 34);
+ } elsif ($envname eq "none") {
+ return $self->setup_none("$path/none");
} else {
return "UNKNOWN";
}
return $env;
}
+sub setup_none($$)
+{
+ my ($self, $path) = @_;
+
+ my $ret = {
+ KRB5_CONFIG => abs_path($path) . "/no_krb5.conf",
+ SAMBA_PID => -1,
+ }
+}
+
1;