summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-12-27 04:17:28 -0600
committerStefan Metzmacher <metze@samba.org>2007-12-26 22:21:01 -0600
commit6ac5221680d0a8f7f41823893d1bf90d61c392e5 (patch)
tree145c2ce56ede95be415d7662950f893907f538ba
parent222262b54e74a01a66b3cbbea5502d4ce488905d (diff)
downloadsamba-6ac5221680d0a8f7f41823893d1bf90d61c392e5.tar.gz
samba-6ac5221680d0a8f7f41823893d1bf90d61c392e5.tar.bz2
samba-6ac5221680d0a8f7f41823893d1bf90d61c392e5.zip
r26609: Try a few more variatations to get the selftest to run against
OpenLDAP. Andrew Bartlett (This used to be commit ff77bd62ced5a5c46e7d8d7eae8c83a96ec9525a)
-rw-r--r--source4/selftest/env/Samba4.pm17
1 files changed, 16 insertions, 1 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index ae7302fc4a..61edeb3885 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -241,9 +241,20 @@ sub mk_openldap($$$)
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 @@ moduleload syncprov
print CONF "
moduleload back_hdb
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -265,6 +277,7 @@ moduleload syncprov
modulepath /usr/lib/ldap
moduleload back_hdb
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -275,6 +288,7 @@ moduleload syncprov
print CONF "
modulepath /usr/lib/openldap
moduleload syncprov
+moduleload memberof
";
close(CONF);
}
@@ -285,6 +299,7 @@ moduleload syncprov
print CONF "
modulepath /usr/lib64/openldap
moduleload syncprov
+moduleload memberof
";
close(CONF);
}