diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-08-17 05:22:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:02 -0500 |
| commit | 20e9fe6b503aaba9367ee82a1d4435c1b68097ce (patch) | |
| tree | 5b4b6e195fad072028e74aa573c90511cded43eb | |
| parent | 1133678c346d51f669892973a4c99982c7b28f86 (diff) | |
| download | samba-20e9fe6b503aaba9367ee82a1d4435c1b68097ce.tar.gz samba-20e9fe6b503aaba9367ee82a1d4435c1b68097ce.tar.bz2 samba-20e9fe6b503aaba9367ee82a1d4435c1b68097ce.zip | |
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)
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 20 |
1 files changed, 20 insertions, 0 deletions
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"); |