s3/libads: Change "ldap ssl:ads" parameter to "ldap ssl ads".

This used to be commit 3f9daf43.

Karolin

diff --git a/source/include/proto.h b/source/include/proto.h
index b1e3a08a7da81e0479cc78052577e0bc8e5c1bdf..226f7be30a7a18a4080fec3d05db745ff1bf7603 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -5688,6 +5688,7 @@ bool lp_passdb_expand_explicit(void);
 char *lp_ldap_suffix(void);
 char *lp_ldap_admin_dn(void);
 int lp_ldap_ssl(void);
+bool lp_ldap_ssl_ads(void);
 int lp_ldap_passwd_sync(void);
 bool lp_ldap_delete_dn(void);
 int lp_ldap_replication_sleep(void);

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 5c95d4f61246c75ebb0a6f29871b34f2780ff09e..a91f4ac381303baf44a1e7f54a00f44e7911863a 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -672,7 +672,7 @@ got_connection:
 
        ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
 
-       if (lp_parm_bool(-1, "ldap ssl", "ads", false)) {
+       if ( lp_ldap_ssl_ads() ) {
                status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
                if (!ADS_ERR_OK(status)) {
                        goto out;

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 3058e51f7f28222148389e733f90542362f63f84..027cd3d8260d78cd237b9b85ef568128d9606d09 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -250,6 +250,7 @@ struct global {
        char *szLdapIdmapSuffix;
        char *szLdapGroupSuffix;
        int ldap_ssl;
+       bool ldap_ssl_ads;
        char *szLdapSuffix;
        char *szLdapAdminDn;
        int ldap_debug_level;
@@ -3575,6 +3576,15 @@ static struct parm_struct parm_table[] = {
                .enum_list      = enum_ldap_ssl,
                .flags          = FLAG_ADVANCED,
        },
+       {
+               .label          = "ldap ssl ads",
+               .type           = P_BOOL,
+               .p_class        = P_GLOBAL,
+               .ptr            = &Globals.ldap_ssl_ads,
+               .special        = NULL,
+               .enum_list      = NULL,
+               .flags          = FLAG_ADVANCED,
+       },
        {
                .label          = "ldap timeout",
                .type           = P_INTEGER,
@@ -4784,6 +4794,7 @@ static void init_globals(bool first_time_only)
 
        string_set(&Globals.szLdapAdminDn, "");
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
+       Globals.ldap_ssl_ads = False;
        Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
        Globals.ldap_delete_dn = False;
        Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
@@ -5107,6 +5118,7 @@ FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit)
 FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
 FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
 FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
+FN_GLOBAL_BOOL(lp_ldap_ssl_ads, &Globals.ldap_ssl_ads)
 FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
 FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
 FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, &Globals.ldap_replication_sleep)