summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-03-04 21:16:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:11 -0500
commit112e520073e417a024c0536ba43669c115de3814 (patch)
tree3a49748797b88496a0f8d18b5aa0c06d193729a5 /source4/script
parent737d24c9fc7fceb8035b4c4a1e2a9ffa1e060404 (diff)
downloadsamba-112e520073e417a024c0536ba43669c115de3814.tar.gz
samba-112e520073e417a024c0536ba43669c115de3814.tar.bz2
samba-112e520073e417a024c0536ba43669c115de3814.zip
r21687: Always test LDAP and LDAPS
(This used to be commit e830b815962da575aea9f9dc6bfee8eda8ec43c9)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/test_ldap.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/script/tests/test_ldap.sh b/source4/script/tests/test_ldap.sh
index 0c71103ffd..4a331724aa 100755
--- a/source4/script/tests/test_ldap.sh
+++ b/source4/script/tests/test_ldap.sh
@@ -9,8 +9,7 @@ exit 1;
fi
# see if we support ldaps
-if grep HAVE_LIBGNUTLS.1 include/config.h > /dev/null &&
- test -n "$CONFFILE" && grep tls.enabled.=yes $CONFFILE > /dev/null; then
+if grep HAVE_LIBGNUTLS.1 include/config.h > /dev/null > /dev/null; then
PROTOCOLS="ldap ldaps"
else
PROTOCOLS="ldap"