s3/loadparm.c: Change default value for "ldap ssl".
authorKarolin Seeger <kseeger@samba.org>
Wed, 17 Dec 2008 14:53:51 +0000 (15:53 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 17 Dec 2008 15:55:39 +0000 (16:55 +0100)
LDAP_SSL_ON is not defined at all. That's why the actual default value
was "" for a long time. Set a more sensible default value without chnging the
default behaviour.

-----8<------------------snip--------------8<--------------
user@host:/data/git/samba/v3-0-test/source> git grep LDAP_SSL_ON | cat
include/smb.h:enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF,
LDAP_SSL_START_TLS};
param/loadparm.c:       Globals.ldap_ssl = LDAP_SSL_ON;
----->8------------------snap-------------->8--------------

It's the same in 3.2 and 3.3 series.

Karolin
(cherry picked from commit e6d883e003d4560c55259ae1cfdf7319602f76e3)
(cherry picked from commit 5c686419096362176d80f3d05339b8836d0178a4)

source/param/loadparm.c

index 0ac16d1c2a9e7e0ebc43efd33c1c607734e03adf..4fc0c06a9761f8c4ca5565f2d04822c25b082b15 100644 (file)
@@ -1595,7 +1595,7 @@ static void init_globals(BOOL first_time_only)
        string_set(&Globals.szLdapIdmapSuffix, "");
 
        string_set(&Globals.szLdapAdminDn, "");
-       Globals.ldap_ssl = LDAP_SSL_ON;
+       Globals.ldap_ssl = LDAP_SSL_OFF;
        Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
        Globals.ldap_delete_dn = False;
        Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */