sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

ads: set sasl-wrapping to plain when over TLS

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14439

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Isaac Boukris 2020-07-02 09:33:12 +02:00 committed by Isaac Boukris
parent b3af1d334d
commit 39b293c2d0
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WHATSNEW.txt
View File

@ -22,6 +22,11 @@ The "ldap ssl ads" option no longer depends on "ldap ssl" option:
With this release, the "ldap ssl ads" can be set to "yes" even if "ldap ssl"
is off.
The "ldap ssl ads" no longer requires sasl-wrapping to be set to plain:
-----------------------------------------------------------------------
This is now done implicitly when over TLS, so "client ldap sasl wrapping"
does not need to be set to "plain" in order for it to work.
REMOVED FEATURES
================

1
selftest/knownfail.d/net_ads_tls
View File

@ -1 +0,0 @@
^samba4.blackbox.net_ads_tls

4
source3/libads/ldap.c
View File

@ -707,6 +707,10 @@ got_connection:
if (!ADS_ERR_OK(status)) {
goto out;
}
if (!ads_set_sasl_wrap_flags(ads, 0)) {
status = ADS_ERROR(LDAP_OPERATIONS_ERROR);
goto out;
}
}
/* fill in the current time and offsets */