The branch, v4-13-test has been updated
via 5df2c348ca9 Remove depracated "ldap ssl ads" smb.conf option
via 78a6cce9c79 ctdb-tests: Stop cat command failure from causing test
failure
from bb49e891025 winbind: Fix lookuprids cache problem
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-13-test
- Log -----------------------------------------------------------------
commit 5df2c348ca9ee31b542d207217d12e5b9403453d
Author: Isaac Boukris <ibouk...@gmail.com>
Date: Mon Aug 10 12:15:26 2020 +0200
Remove depracated "ldap ssl ads" smb.conf option
Signed-off-by: Isaac Boukris <ibouk...@samba.org>
Autobuild-User(v4-13-test): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(v4-13-test): Wed Aug 12 11:16:04 UTC 2020 on sn-devel-184
commit 78a6cce9c7949be2d5be640b66fd43fa0a45d73e
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Jul 6 14:02:49 2020 +1000
ctdb-tests: Stop cat command failure from causing test failure
In certain circumstance, which aren't obvious, cat(1) can fail when
attempting to write a lot of data. This is due to something (probably
write(2)) returning EAGAIN.
Given that the -v option should only really be used for test
debugging, ignore the failure instead of spending time debugging it.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14446
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
(cherry picked from commit 3ff8765d04c0fb950b7be4f9a049999aeb08223b)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 2 ++
ctdb/tests/scripts/integration.bash | 2 +-
docs-xml/smbdotconf/ldap/ldapsslads.xml | 21 ---------------------
source3/libads/ldap.c | 7 -------
source3/param/loadparm.c | 1 -
5 files changed, 3 insertions(+), 30 deletions(-)
delete mode 100644 docs-xml/smbdotconf/ldap/ldapsslads.xml
Changeset truncated at 500 lines:
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/ctdb/tests/scripts/integration.bash
b/ctdb/tests/scripts/integration.bash
index 31f4387a404..39c4e8b8167 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -164,7 +164,7 @@ try_command_on_node ()
if $verbose ; then
echo "Output of \"$cmd\":"
- cat "$outfile"
+ cat "$outfile" || true
fi
}
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;
--
Samba Shared Repository
