Author: abartlet Date: 2007-08-17 05:22:58 +0000 (Fri, 17 Aug 2007) New Revision: 24503
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24503 Log: Make 'make test TEST_LDAP=yes' pass on Fedora 7, by trying more combinations of modules. 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-08-17 05:21:05 UTC (rev 24502) +++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-08-17 05:22:58 UTC (rev 24503) @@ -232,6 +232,26 @@ 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");