summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-11-02 03:14:27 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-11-02 03:14:27 +0000
commita66b852ddc495dda484b18d3d97ae1a2d1161254 (patch)
treeed4cfab6b6fd50cc78bb1ac039e9edb547a1d64d /source3/param
parent642ee6fb37a10d481424804332228a127316f40c (diff)
downloadsamba-a66b852ddc495dda484b18d3d97ae1a2d1161254.tar.gz
samba-a66b852ddc495dda484b18d3d97ae1a2d1161254.tar.bz2
samba-a66b852ddc495dda484b18d3d97ae1a2d1161254.zip
Fixes for pdb_ldap:
- Default is now for start-tls, on the ldap (not ldaps) port - We check for 'I am currently root' in the right place now, and don't accidentily use a cached connection. - We don't loop on failure to be root, or some other errors. - A bit cleaner error reporting for add/modify. - Both the OpenLDAP and manual URI parsing tested. Andrew Bartlett (This used to be commit cfa1e459d727764feddcfdd8c9c0404282e2d0e8)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c54281332b..7c87a51684 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -583,10 +583,12 @@ static struct enum_list enum_printing[] = {
};
static struct enum_list enum_ldap_ssl[] = {
+#ifdef WITH_LDAP_SAMCONFIG
{LDAP_SSL_ON, "Yes"},
{LDAP_SSL_ON, "yes"},
{LDAP_SSL_ON, "on"},
{LDAP_SSL_ON, "On"},
+#endif
{LDAP_SSL_OFF, "no"},
{LDAP_SSL_OFF, "No"},
{LDAP_SSL_OFF, "off"},