diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-05-29 12:18:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:02 -0500 |
| commit | 86a4886e393189b7679ec6220d4d59bb6ef1b50e (patch) | |
| tree | b4adcdc877e7d0d08127925bb7a18c972d06e1c9 /source4/selftest/Samba4.pm | |
| parent | fbe7d8cbc5df572024098bfae2ad2666cd4bcc47 (diff) | |
| download | samba-86a4886e393189b7679ec6220d4d59bb6ef1b50e.tar.gz samba-86a4886e393189b7679ec6220d4d59bb6ef1b50e.tar.bz2 samba-86a4886e393189b7679ec6220d4d59bb6ef1b50e.zip | |
r23189: Work towards a totally scripted setup of LDAP backends, so others can
easily try this out.
I also intend to use this for the selftest, but I'm chasing issues
with the OpenlDAP (but not Fedora DS) backend.
Andrew Bartlett
(This used to be commit 0f457b1d2e20c36ab220b4a6711ce7930c4c7d21)
Diffstat (limited to 'source4/selftest/Samba4.pm')
| -rw-r--r-- | source4/selftest/Samba4.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm index 297391e38f..42dc989c56 100644 --- a/source4/selftest/Samba4.pm +++ b/source4/selftest/Samba4.pm @@ -422,8 +422,8 @@ 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 $privatedir/$dnsname-config.ldif >/dev/null") == 0 or die("slapadd failed"); - system("slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l $privatedir/$dnsname-schema.ldif >/dev/null") == 0 or die("slapadd failed"); + 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"); system("slaptest -u -f $slapd_conf >/dev/null") == 0 or die ("slaptest after database load failed"); @@ -458,7 +458,7 @@ sub provision($$$$$$) my $winbindd_socket_dir = "$prefix_abs/winbind_socket"; my $configuration = "--configfile=$conffile"; - my $ldapdir = "$prefix_abs/ldap"; + my $ldapdir = "$privatedir/ldap"; my $tlsdir = "$privatedir/tls"; |