summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-08-10 22:01:28 +1000
committerAndrew Bartlett <abartlet@samba.org>2009-08-12 10:01:49 +1000
commit69fa901bca9b1e032d6784df60a0e1c14d27d830 (patch)
treebc42c70dfd3b78623450d5ee6c653cc3676e704c
parent4921a5853b323e9c19f192220a94cf4a7cd077ff (diff)
downloadsamba-69fa901bca9b1e032d6784df60a0e1c14d27d830.tar.gz
samba-69fa901bca9b1e032d6784df60a0e1c14d27d830.tar.bz2
samba-69fa901bca9b1e032d6784df60a0e1c14d27d830.zip
s4:selftest Don't start the slapd for the provision, only for the run
The provision-backend script now starts slapd for us Andrew Bartlett
-rw-r--r--selftest/target/Samba4.pm29
1 files changed, 12 insertions, 17 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index a4e3c58835..0f909ce4b2 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -32,16 +32,7 @@ sub bindir_path($$) {
sub openldap_start($$$) {
my ($slapd_conf, $uri, $logs) = @_;
- my $oldpath = $ENV{PATH};
- my $olroot = "";
- my $olpath = "";
- if (defined $ENV{OPENLDAP_ROOT}) {
- $olroot = "$ENV{OPENLDAP_ROOT}";
- $olpath = "$olroot/libexec:$olroot/sbin:";
- }
- $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
- system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &");
- $ENV{PATH} = $oldpath;
+ system("$ENV{OPENLDAP_SLAPD} -d0 -f $slapd_conf -h $uri > $logs 2>&1 &");
}
sub slapd_start($$)
@@ -118,7 +109,7 @@ sub check_or_start($$$)
# Start slapd before samba, but with the fifo on stdin
if (defined($self->{ldap})) {
$self->slapd_start($env_vars) or
- die("couldn't start slapd (2nd time)");
+ die("couldn't start slapd (main run)");
}
my $optarg = "";
@@ -794,29 +785,33 @@ sub provision($$$$$$$)
$ret->{LDAP_URI} = $ctx->{ldap_uri};
push (@{$ctx->{provision_options}},"--ldap-backend=$ctx->{ldap_uri}");
- system("$self->{setupdir}/provision-backend $configuration --ldap-admin-pass=$ctx->{password} --root=$ctx->{unix_name} --realm=$ctx->{realm} --domain=$ctx->{domain} --host-name=$ctx->{netbiosname} --ldap-backend-type=$self->{ldap} --nosync>&2") == 0 or die("backend provision failed");
-
push (@{$ctx->{provision_options}}, "--password=$ctx->{password}");
if ($self->{ldap} eq "openldap") {
push (@{$ctx->{provision_options}}, "--username=samba-admin");
- push (@{$ctx->{provision_options}}, "--ldap-backend-type=openldap");
+ push (@{$ctx->{provision_options}}, "--ldap-backend-type=openldap");
+
+ system("$self->{setupdir}/provision-backend $configuration --ldap-admin-pass=$ctx->{password} --root=$ctx->{unix_name} --realm=$ctx->{realm} --domain=$ctx->{domain} --host-name=$ctx->{netbiosname} --ldap-backend-type=$self->{ldap} --nosync --ol-slapd=$ENV{OPENLDAP_SLAPD}>&2") == 0 or die("backend provision failed");
($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ctx->{ldapdir}, $configuration) or die("Unable to create openldap directories");
- } elsif ($self->{ldap} eq "fedora-ds") {
+ } elsif ($self->{ldap} eq "fedora-ds") {
push (@{$ctx->{provision_options}}, "--simple-bind-dn=cn=Manager,$ctx->{localbasedn}");
push (@{$ctx->{provision_options}}, "--ldap-backend-type=fedora-ds");
+ system("$self->{setupdir}/provision-backend $configuration --ldap-admin-pass=$ctx->{password} --root=$ctx->{unix_name} --realm=$ctx->{realm} --domain=$ctx->{domain} --host-name=$ctx->{netbiosname} --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+
($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ctx->{ldapdir}, $configuration) or die("Unable to create fedora ds directories");
+
+ $self->slapd_start($ret) or die("couldn't start slapd");
+
}
- $self->slapd_start($ret) or die("couldn't start slapd");
}
$ret = $self->provision_raw_step2($ctx, $ret);
- if (defined($self->{ldap})) {
+ if (defined($self->{ldap}) && ($self->{ldap} eq "fedora-ds")) {
$self->slapd_stop($ret) or die("couldn't stop slapd");
}