diff options
| -rw-r--r-- | WHATSNEW.txt | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapsslads.xml | 21 | ||||
| -rwxr-xr-x | source3/libads/ldap.c | 7 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
4 files changed, 2 insertions, 29 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 58bcf9ba20a..5fd139e9d4b 100644 --- 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 index 98c39651f1e..00000000000 --- 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 55c9668089d..10ab043f721 100755 --- 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 cf5da0aca21..6674485738a 100644 --- 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; |