r24503: Make 'make test TEST_LDAP=yes' pass on Fedora 7, by trying more

combinations of modules.

Andrew Bartlett

diff --git a/source/selftest/env/Samba4.pm b/source/selftest/env/Samba4.pm
index 597cc5d50cf9df193980f50be692d697274fefd0..11afc0e6f31c1dbcc083b076ac293f15882f2411 100644 (file)
--- a/source/selftest/env/Samba4.pm
+++ b/source/selftest/env/Samba4.pm
@@ -232,6 +232,26 @@ moduleload syncprov
                close(CONF);
        }
 
+       if (system("slaptest -u -f $slapd_conf >&2") != 0) {
+               open(CONF, ">$modconf"); 
+               # enable slapd modules (Fedora layout)
+               print CONF "
+modulepath     /usr/lib/openldap
+moduleload     syncprov
+";
+               close(CONF);
+       }
+
+       if (system("slaptest -u -f $slapd_conf >&2") != 0) {
+               open(CONF, ">$modconf"); 
+               # enable slapd modules (Fedora x86_64 layout)
+               print CONF "
+modulepath     /usr/lib64/openldap
+moduleload     syncprov
+";
+               close(CONF);
+       }
+
        system("slaptest -u -f $slapd_conf") == 0 or die("slaptest still fails after adding modules");