From: Andrew Bartlett Date: Tue, 30 May 2023 04:38:22 +0000 (+1200) Subject: s3-libads: Also handle the DS_WEB_SERVICE_REQUIRED flag in check_cldap_reply_required... X-Git-Tag: talloc-2.4.1~516 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f3abb291fd58f83c2a3f765aa5e50771e8ba9ab;p=thirdparty%2Fsamba.git s3-libads: Also handle the DS_WEB_SERVICE_REQUIRED flag in check_cldap_reply_required_flags() Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/selftest/knownfail.d/getdcname b/selftest/knownfail.d/getdcname index 55bb6c82224..30d5fc7eda2 100644 --- a/selftest/knownfail.d/getdcname +++ b/selftest/knownfail.d/getdcname @@ -1,4 +1,3 @@ ^samba.tests.getdcname.samba.tests.getdcname.GetDCNameEx.test_get_dc_direct_need_2012r2_but_not_found\(fl2008r2dc\) ^samba.tests.getdcname.samba.tests.getdcname.GetDCNameEx.test_get_dc_direct_need_2012r2_but_not_found_fallback ^samba.tests.getdcname.samba.tests.getdcname.GetDCNameEx.test_get_dc_direct_need_web_but_not_found -^samba.tests.getdcname.samba.tests.getdcname.GetDCNameEx.test_get_dc_winbind_need_web_but_not_found diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c index 623d98dcdf4..56c2537ffa9 100644 --- a/source3/libads/cldap.c +++ b/source3/libads/cldap.c @@ -79,6 +79,9 @@ bool check_cldap_reply_required_flags(uint32_t ret_flags, if (req_flags & DS_TIMESERV_REQUIRED) RETURN_ON_FALSE(ret_flags & NBT_SERVER_TIMESERV); + if (req_flags & DS_WEB_SERVICE_REQUIRED) + RETURN_ON_FALSE(ret_flags & NBT_SERVER_ADS_WEB_SERVICE); + if (req_flags & DS_WRITABLE_REQUIRED) RETURN_ON_FALSE(ret_flags & NBT_SERVER_WRITABLE);