summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-04-23 21:56:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:33 -0500
commitf1851e7abc3d019253f679deed31c6e948127037 (patch)
tree0f883ba2b1eb54766b6a498be9f5de0039c2f09c /source4/script
parentc58042c90e31fa77b91bd065f3b8e5db6307ed51 (diff)
downloadsamba-f1851e7abc3d019253f679deed31c6e948127037.tar.gz
samba-f1851e7abc3d019253f679deed31c6e948127037.tar.bz2
samba-f1851e7abc3d019253f679deed31c6e948127037.zip
r22494: Skip subSchema again, but we will need to remap this objectClass.
Make the Fedora DS backend test again. Andrew Bartlett (This used to be commit 65327a0e4d61e2c9813720f04fe24ffc5c49278b)
Diffstat (limited to 'source4/script')
-rw-r--r--source4/script/tests/Samba4.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 8bb7a96bc3..e9166cef09 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -26,7 +26,7 @@ sub openldap_start($$$) {
my ($slapd_conf, $uri, $logs) = @_;
my $oldpath = $ENV{PATH};
$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
- system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &");
+ system("slapd -d -f $slapd_conf -h $uri > $logs 2>&1 &");
$ENV{PATH} = $oldpath;
}
@@ -66,6 +66,7 @@ sub slapd_stop($$)
kill 9, <IN>;
close(IN);
}
+ return 1;
}
sub check_or_start($$$)
@@ -645,8 +646,6 @@ sub provision($$$$$)
SOCKET_WRAPPER_DEFAULT_IFACE => $swiface
};
- $ret->{PROVISION_OPTIONS} = join(' ', @provision_options);
-
if (defined($self->{ldap})) {
if ($self->{ldap} eq "openldap") {
@@ -659,12 +658,16 @@ sub provision($$$$$)
$self->slapd_start($ret) or
die("couldn't start slapd");
+ $ret->{PROVISION_OPTIONS} = join(' ', @provision_options);
+
print "LDAP PROVISIONING...";
$self->provision_ldap($ret);
$self->slapd_stop($ret) or
die("couldn't stop slapd");
- }
+ } else {
+ $ret->{PROVISION_OPTIONS} = join(' ', @provision_options);
+ }
return $ret;
}