From 20e9fe6b503aaba9367ee82a1d4435c1b68097ce Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 17 Aug 2007 05:22:58 +0000 Subject: r24503: Make 'make test TEST_LDAP=yes' pass on Fedora 7, by trying more combinations of modules. Andrew Bartlett (This used to be commit 481a3f0b2ac217b0db2f481479d655910514b56c) --- source4/selftest/env/Samba4.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index 597cc5d50c..11afc0e6f3 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/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"); -- cgit