svn commit: samba r26609 - in
branches/SAMBA_4_0/source/selftest/env: .
abartlet at samba.org
abartlet at samba.org
Thu Dec 27 04:17:29 GMT 2007
Author: abartlet
Date: 2007-12-27 04:17:28 +0000 (Thu, 27 Dec 2007)
New Revision: 26609
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26609
Log:
Try a few more variatations to get the selftest to run against
OpenLDAP.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/selftest/env/Samba4.pm
Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-27 03:09:49 UTC (rev 26608)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-27 04:17:28 UTC (rev 26609)
@@ -241,9 +241,20 @@
open(CONF, ">$modconf");
# enable slapd modules
print CONF "
-modulepath $olpath/libexec/openldap
+modulepath $olroot/libexec/openldap
+moduleload syncprov
+moduleload memberof
+";
+ close(CONF);
+ }
+ if (system("slaptest -u -f $slapd_conf >&2") != 0) {
+ open(CONF, ">$modconf");
+ # enable slapd modules
+ print CONF "
+modulepath $olroot/libexec/openldap
moduleload back_hdb
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -254,6 +265,7 @@
print CONF "
moduleload back_hdb
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -265,6 +277,7 @@
modulepath /usr/lib/ldap
moduleload back_hdb
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -275,6 +288,7 @@
print CONF "
modulepath /usr/lib/openldap
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -285,6 +299,7 @@
print CONF "
modulepath /usr/lib64/openldap
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
More information about the samba-cvs
mailing list