r23233: Use the schema and basedn files generated by the provision-backend script.

(Moving towards using only the script's output, one step at a time).

Andrew Bartlett

diff --git a/source/selftest/Samba4.pm b/source/selftest/Samba4.pm
index 1f84ec7c8835ab0498ef6c5c4b6bc28e94b37545..e579123d3aee50af8bd1372a540ee5b5640417ee 100644 (file)
--- a/source/selftest/Samba4.pm
+++ b/source/selftest/Samba4.pm
@@ -332,11 +332,8 @@ syncprov-sessionlog 100
        write_openldap_dbconfig("$ldapdir/db/config");
        write_openldap_dbconfig("$ldapdir/db/schema");
 
-       #This uses the provision we just did, to read out the schema
-       system("$self->{bindir}/ad2oLschema $configuration -H $privatedir/sam.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/ad.schema >&2") == 0 or die("schema conversion for OpenLDAP failed");
-
-       #Now create an LDAP baseDN
-       system("$self->{bindir}/smbscript $self->{setupdir}/provision $provision_options --ldap-base >&2") == 0 or die("creating an OpenLDAP basedn failed");
+       #This uses the provision-backend we just did, to read out the schema
+       system("$self->{bindir}/ad2oLschema $configuration -H $ldapdir/schema-tmp.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/ad.schema >&2") == 0 or die("schema conversion for OpenLDAP failed");
 
        my $oldpath = $ENV{PATH};
        $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";