r26609: Try a few more variatations to get the selftest to run against

OpenLDAP.

Andrew Bartlett
(This used to be commit ff77bd62ced5a5c46e7d8d7eae8c83a96ec9525a)

diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index ae7302fc4a4bb9bac659c02a3841485a21af4dab..61edeb388548d7601b3b186dce619b9f83489b20 100644 (file)
--- 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);
        }