summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-05-31 00:00:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:53:06 -0500
commitc46e5868de4f1871dd2888487068b17bf9bf610b (patch)
tree63ba41c8105773775823d99fcffd4f5f6fffd3bb /source4
parentadf23c651b120d3bfe67a551d0569705831999b8 (diff)
downloadsamba-c46e5868de4f1871dd2888487068b17bf9bf610b.tar.gz
samba-c46e5868de4f1871dd2888487068b17bf9bf610b.tar.bz2
samba-c46e5868de4f1871dd2888487068b17bf9bf610b.zip
r23257: Newer OpenLDAP versions don't seem to need this, so simplfy.
Andrew Bartlett (This used to be commit 3ecd180343f381dd0e1a3221f63590e8352d50e8)
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/Samba4.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm
index 7ccacc97cc..e7daf7aece 100644
--- a/source4/selftest/Samba4.pm
+++ b/source4/selftest/Samba4.pm
@@ -204,9 +204,9 @@ chdir "$ENV{FEDORA_DS_PREFIX}/bin" || die;
return ($fedora_ds_dir, $pidfile);
}
-sub mk_openldap($$$$$)
+sub mk_openldap($$$)
{
- my ($self, $ldapdir, $configuration, $basedn, $dnsname, $password) = @_;
+ my ($self, $ldapdir, $configuration) = @_;
my $slapd_conf = "$ldapdir/slapd.conf";
my $pidfile = "$ldapdir/slapd.pid";
@@ -233,8 +233,6 @@ moduleload syncprov
}
system("slaptest -u -f $slapd_conf") == 0 or die("slaptest still fails after adding modules");
- system("slapadd -b cn=Configuration,$basedn -f $slapd_conf -l $ldapdir/$dnsname-config.ldif >/dev/null") == 0 or die("slapadd failed");
- system("slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l $ldapdir/$dnsname-schema.ldif >/dev/null") == 0 or die("slapadd failed");
$ENV{PATH} = $oldpath;
@@ -438,7 +436,7 @@ my @provision_options = ("$self->{bindir}/smbscript", "$self->{setupdir}/provisi
system("$self->{bindir}/smbscript $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$root --realm=$dnsname --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
if ($self->{ldap} eq "openldap") {
- ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration, $basedn, $dnsname, $password) or die("Unable to create openldap directories");
+ ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");
} elsif ($self->{ldap} eq "fedora-ds") {
($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ldapdir, $configuration) or die("Unable to create fedora ds directories");
push (@provision_options, "--ldap-module=nsuniqueid");