svn commit: samba r25450 - in branches/SAMBA_4_0/source: selftest/env setup

[abartlet at samba.org]

Author: abartlet
Date: 2007-10-01 21:07:07 +0000 (Mon, 01 Oct 2007)
New Revision: 25450

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

Log:
Make it easier to test with a particular version of OpenLDAP, by
setting OPENLDAP_PATH, move to using hdb as the backend (allows
subtree renames), and re-enable the --quiet option.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm
   branches/SAMBA_4_0/source/setup/slapd.conf


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-01 19:46:00 UTC (rev 25449)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-01 21:07:07 UTC (rev 25450)
@@ -216,7 +216,7 @@
 	system("$self->{bindir}/ad2oLschema $configuration --option=convert:target=openldap -H $ldapdir/schema-tmp.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/backend-schema.schema >&2") == 0 or die("schema conversion for OpenLDAP failed");
 
 	my $oldpath = $ENV{PATH};
-	$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
+	$ENV{PATH} = "$ENV{OPENLDAP_PATH}/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
 
 	unlink($modconf);
 	open(CONF, ">$modconf"); close(CONF);
@@ -225,8 +225,18 @@
 		open(CONF, ">$modconf"); 
 		# enable slapd modules
 		print CONF "
+moduleload	back_hdb
+moduleload	syncprov
+";
+		close(CONF);
+	}
+
+	if (system("slaptest -u -f $slapd_conf >&2") != 0) {
+		open(CONF, ">$modconf"); 
+		# enable slapd modules
+		print CONF "
 modulepath	/usr/lib/ldap
-moduleload	back_bdb
+moduleload	back_hdb
 moduleload	syncprov
 ";
 		close(CONF);
@@ -412,7 +422,7 @@
 	push (@provision_options, split(' ', $configuration));
 	push (@provision_options, "--host-name=$netbiosname");
 	push (@provision_options, "--host-ip=$ifaceipv4");
-#	push (@provision_options, "--quiet");
+	push (@provision_options, "--quiet");
 	push (@provision_options, "--domain=$domain");
 	push (@provision_options, "--realm=$realm");
 	push (@provision_options, "--adminpass=$password");

Modified: branches/SAMBA_4_0/source/setup/slapd.conf
===================================================================
--- branches/SAMBA_4_0/source/setup/slapd.conf	2007-10-01 19:46:00 UTC (rev 25449)
+++ branches/SAMBA_4_0/source/setup/slapd.conf	2007-10-01 21:07:07 UTC (rev 25450)
@@ -21,7 +21,7 @@
 
 defaultsearchbase ${DOMAINDN}
 
-backend		bdb
+backend		hdb
 database        bdb
 suffix		${SCHEMADN}
 directory	${LDAPDIR}/db/schema
@@ -32,7 +32,7 @@
 index lDAPDisplayName eq
 index subClassOf eq
 
-database        bdb
+database        hdb
 suffix		${CONFIGDN}
 directory	${LDAPDIR}/db/config
 index           objectClass eq
@@ -45,7 +45,7 @@
 index dnsRoot eq
 index nETBIOSName eq pres
 
-database        bdb
+database        hdb
 suffix		${DOMAINDN}
 rootdn          ${LDAPMANAGERDN}
 rootpw          ${LDAPMANAGERPASS}