From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/
Date: Sun, 27 Mar 2022 22:08:27 +0000 (UTC) [thread overview]
Message-ID: <1648418830.ae7006fec245841587c69fd4c153322ed8a24324.conikost@gentoo> (raw)
commit: ae7006fec245841587c69fd4c153322ed8a24324
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 13 10:05:47 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:07:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7006fe
net-fs/samba: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/24528
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../samba-4.14.10-winbindd_regression_fix.patch | 42 ----------------------
.../samba-4.15.2-winbindd_regression_fix.patch | 42 ----------------------
2 files changed, 84 deletions(-)
diff --git a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch b/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
deleted file mode 100644
index 23411dad6bec..000000000000
--- a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bc07c3b70702100975f8921e56cf9b733ec3b826 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Tue, 9 Nov 2021 20:50:20 +0100
-Subject: [PATCH] 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
-BUILTIN.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
-
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)
----
- source3/winbindd/winbindd_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
-index 42ddbfd2f44e..9d54e462c425 100644
---- a/source3/winbindd/winbindd_util.c
-+++ b/source3/winbindd/winbindd_util.c
-@@ -134,7 +134,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
- return NT_STATUS_INVALID_PARAMETER;
- }
-
-- if (!is_allowed_domain(domain_name)) {
-+ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {
- return NT_STATUS_NO_SUCH_DOMAIN;
- }
-
---
-2.25.1
-
diff --git a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch b/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
deleted file mode 100644
index 457bad16a6e2..000000000000
--- a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9f73f8a784f2de9211601f92729a47aaa3e51a1a Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Tue, 9 Nov 2021 20:50:20 +0100
-Subject: [PATCH] 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
-BUILTIN.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
-
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)
----
- source3/winbindd/winbindd_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
-index fe68adec534a..a8c510fafc67 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,
- return NT_STATUS_INVALID_PARAMETER;
- }
-
-- if (!is_allowed_domain(domain_name)) {
-+ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {
- return NT_STATUS_NO_SUCH_DOMAIN;
- }
-
---
-2.25.1
-
next reply other threads:[~2022-03-27 22:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-27 22:08 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-17 14:35 [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/ David Seifert
2023-02-01 23:49 Sam James
2023-01-27 5:42 Sam James
2022-06-24 5:26 Sam James
2018-07-16 9:50 Lars Wendler
2016-01-13 16:46 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1648418830.ae7006fec245841587c69fd4c153322ed8a24324.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox