[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Nov 10 11:22:01 UTC 2021

The branch, master has been updated
       via  a7f6c60cb03 s3:winbindd: fix "allow trusted domains = no" regression
      from  3121be69cac CVE-2021-3738 s4:rpc_server/samr: make use of dcesrv_samdb_connect_as_*() helper


- Log -----------------------------------------------------------------
commit a7f6c60cb037b4bc9eee276236539b8282213935
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 9 20:50:20 2021 +0100

    s3:winbindd: fix "allow trusted domains = no" regression
    add_trusted_domain() should only reject domains
    based on is_allowed_domain(), which now also
    checks "allow trusted domains = no", if we don't
    have an explicit trust to the domain (SEC_CHAN_NULL).
    We use at least SEC_CHAN_LOCAL for local domains like
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184


Summary of changes:
 source3/winbindd/winbindd_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index fe68adec534..a8c510fafc6 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -135,7 +135,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
-	if (!is_allowed_domain(domain_name)) {
+	if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {

Samba Shared Repository

More information about the samba-cvs mailing list