r23257: Newer OpenLDAP versions don't seem to need this, so simplfy.
authorAndrew Bartlett <abartlet@samba.org>
Thu, 31 May 2007 00:00:19 +0000 (00:00 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:53:06 +0000 (14:53 -0500)
Andrew Bartlett
(This used to be commit 3ecd180343f381dd0e1a3221f63590e8352d50e8)

source4/selftest/Samba4.pm

index 7ccacc97cccd90b6859d2823060cdf497aaf2031..e7daf7aece672fc200cd91ab6288bb360f117ef6 100644 (file)
@@ -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");