From 55ee74f8ca9204d7f48bba48d3f775744d11fccd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 30 May 2007 00:36:23 +0000 Subject: 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 (This used to be commit a7a409074a53b6b35727a454f1ecbe5daf376aad) --- source4/selftest/Samba4.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source4') diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm index 1f84ec7c88..e579123d3a 100644 --- a/source4/selftest/Samba4.pm +++ b/source4/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}"; -- cgit