svn commit: samba r23233 - in branches/SAMBA_4_0/source/selftest: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-05-30 00:36:23 +0000 (Wed, 30 May 2007)
New Revision: 23233

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23233

Log:
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

Modified:
   branches/SAMBA_4_0/source/selftest/Samba4.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/Samba4.pm	2007-05-29 23:24:42 UTC (rev 23232)
+++ branches/SAMBA_4_0/source/selftest/Samba4.pm	2007-05-30 00:36:23 UTC (rev 23233)
@@ -332,12 +332,9 @@
 	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");
+	#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");
 
-	#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");
-
 	my $oldpath = $ENV{PATH};
 	$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";