[SCM] Samba Shared Repository - branch master updated -
cf9f2484b70f5b21f0020800ff0f36d49d18b175
Karolin Seeger
kseeger at samba.org
Sun Dec 21 08:00:19 GMT 2008
The branch, master has been updated
via cf9f2484b70f5b21f0020800ff0f36d49d18b175 (commit)
via cbb085b2a295e4fde44737f2243745710ee14d87 (commit)
from 6efb7ff98191c5f62f66be33591f674b682986ac (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cf9f2484b70f5b21f0020800ff0f36d49d18b175
Author: root <root at bando.(none)>
Date: Sun Dec 21 08:55:30 2008 +0100
s3:loadparm/docs: Set default for "ldap ssl" to "start tls".
This has been discussed on samba-technical before.
3.3 and newer only!
Karolin
commit cbb085b2a295e4fde44737f2243745710ee14d87
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Dec 21 08:23:39 2008 +0100
s3: loadparm: Clean-up list of parameters.
We don't need to list several combinations of lowercase and uppercase here.
Karolin
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/ldap/ldapssl.xml | 4 ++--
source3/param/loadparm.c | 11 ++---------
2 files changed, 4 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index d785071..b2e9537 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -27,11 +27,11 @@
</listitem>
<listitem>
- <para><parameter moreinfo="none">Start_tls</parameter> = Use
+ <para><parameter moreinfo="none">start tls</parameter> = Use
the LDAPv3 StartTLS extended operation (RFC2830) for
communicating with the directory server.</para>
</listitem>
</itemizedlist>
</description>
-<value type="default">no</value>
+<value type="default">start tls</value>
</samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9bd6645..8f03ae8 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -722,24 +722,17 @@ static const struct enum_list enum_ldap_sasl_wrapping[] = {
static const struct enum_list enum_ldap_ssl[] = {
{LDAP_SSL_OFF, "no"},
- {LDAP_SSL_OFF, "No"},
{LDAP_SSL_OFF, "off"},
- {LDAP_SSL_OFF, "Off"},
{LDAP_SSL_START_TLS, "start tls"},
- {LDAP_SSL_START_TLS, "Start_tls"},
+ {LDAP_SSL_START_TLS, "start_tls"},
{-1, NULL}
};
static const struct enum_list enum_ldap_passwd_sync[] = {
{LDAP_PASSWD_SYNC_OFF, "no"},
- {LDAP_PASSWD_SYNC_OFF, "No"},
{LDAP_PASSWD_SYNC_OFF, "off"},
- {LDAP_PASSWD_SYNC_OFF, "Off"},
- {LDAP_PASSWD_SYNC_ON, "Yes"},
{LDAP_PASSWD_SYNC_ON, "yes"},
{LDAP_PASSWD_SYNC_ON, "on"},
- {LDAP_PASSWD_SYNC_ON, "On"},
- {LDAP_PASSWD_SYNC_ONLY, "Only"},
{LDAP_PASSWD_SYNC_ONLY, "only"},
{-1, NULL}
};
@@ -4886,7 +4879,7 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szLdapIdmapSuffix, "");
string_set(&Globals.szLdapAdminDn, "");
- Globals.ldap_ssl = LDAP_SSL_OFF;
+ Globals.ldap_ssl = LDAP_SSL_START_TLS;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
--
Samba Shared Repository
More information about the samba-cvs
mailing list