Remove depracated "ldap ssl ads" smb.conf option

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Autobuild-User(v4-13-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-13-test): Wed Aug 12 11:16:04 UTC 2020 on sn-devel-184

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 58bcf9ba20ac09a3175521439fa55daeeb59319c..5fd139e9d4bf7a7aed817dd28814f533950f6f27 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -55,12 +55,14 @@ The release notes will be updated to note this change when it occurs.
 REMOVED FEATURES
 ================
 
+The deprecated "ldap ssl ads" smb.conf option has been removed.
 
 smb.conf changes
 ================
 
   Parameter Name                     Description                Default
   --------------                     -----------                -------
+  ldap ssl ads                       removed
 
   smb2 disable lock sequence checking                          No
 

diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml
deleted file mode 100644 (file)
index 98c3965..0000000
--- a/docs-xml/smbdotconf/ldap/ldapsslads.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<samba:parameter name="ldap ssl ads"
-                 context="G"
-                 type="boolean"
-                deprecated="1"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>This option is used to define whether or not Samba should
-       use SSL when connecting to the ldap server using
-       <emphasis>ads</emphasis> methods.
-       Rpc methods are not affected by this parameter. Please note, that
-       this parameter won't have any effect if <smbconfoption name="ldap ssl"/>
-       is set to <parameter>no</parameter>.
-       </para>
-
-       <para>See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
-       for more information on <smbconfoption name="ldap ssl"/>.
-       </para>
-
-</description>
-<value type="default">no</value>
-</samba:parameter>

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 55c9668089da0be6f6589c3fc1da07b6dfd0488a..10ab043f7212117dd4b28f29a6b111aceac5f22f 100755 (executable)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -702,13 +702,6 @@ got_connection:
 
        ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
 
-       if ( lp_ldap_ssl_ads() ) {
-               status = ADS_ERROR(smbldap_start_tls(ads->ldap.ld, version));
-               if (!ADS_ERR_OK(status)) {
-                       goto out;
-               }
-       }
-
        /* fill in the current time and offsets */
 
        status = ads_current_time( ads );

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index cf5da0aca21c8170de3e059664abda02a14e446a..6674485738abe056a826f2acbf5f7308bf05000e 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -740,7 +740,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 
        lpcfg_string_set(Globals.ctx, &Globals.ldap_admin_dn, "");
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
-       Globals.ldap_ssl_ads = false;
        Globals.ldap_deref = -1;
        Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
        Globals.ldap_delete_dn = false;