summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-01-02 22:44:15 +0000
committerGerald Carter <jerry@samba.org>2002-01-02 22:44:15 +0000
commit93913173eecdcc89bdb882a824a2b312fa920b69 (patch)
tree92d916bb0b63e560d638c11ea08dc912d8f94e0c /source3/param
parent45a475dccb6dce140a8977d537d6c3eb1dc43376 (diff)
downloadsamba-93913173eecdcc89bdb882a824a2b312fa920b69.tar.gz
samba-93913173eecdcc89bdb882a824a2b312fa920b69.tar.bz2
samba-93913173eecdcc89bdb882a824a2b312fa920b69.zip
sync up ldap defaults with 2.2
(This used to be commit 59174310d419aa835031c7a318d85fe25ba28227)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d1448df8d3..724d10c2fa 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -579,6 +579,7 @@ static struct enum_list enum_ldap_ssl[] = {
{LDAP_SSL_OFF, "off"},
{LDAP_SSL_OFF, "Off"},
{LDAP_SSL_START_TLS, "start tls"},
+ {LDAP_SSL_START_TLS, "start_tls"},
{-1, NULL}
};
#endif /* WITH_LDAP_SAM */
@@ -1307,8 +1308,8 @@ static void init_globals(void)
string_set(&Globals.szLdapSuffix, "");
string_set(&Globals.szLdapFilter, "(&(uid=%u)(objectclass=sambaAccount))");
string_set(&Globals.szLdapAdminDn, "");
- Globals.ldap_port = 389;
- Globals.ldap_ssl = LDAP_SSL_OFF;
+ Globals.ldap_port = 636;
+ Globals.ldap_ssl = LDAP_SSL_ON;
#endif /* WITH_LDAP_SAM */
#ifdef WITH_SSL