| 1 |
commit: ae7006fec245841587c69fd4c153322ed8a24324 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Mar 13 10:05:47 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 22:07:10 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7006fe |
| 7 |
|
| 8 |
net-fs/samba: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/24528 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../samba-4.14.10-winbindd_regression_fix.patch | 42 ---------------------- |
| 16 |
.../samba-4.15.2-winbindd_regression_fix.patch | 42 ---------------------- |
| 17 |
2 files changed, 84 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index 23411dad6bec..000000000000 |
| 22 |
--- a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,42 +0,0 @@ |
| 25 |
-From bc07c3b70702100975f8921e56cf9b733ec3b826 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Stefan Metzmacher <metze@×××××.org> |
| 27 |
-Date: Tue, 9 Nov 2021 20:50:20 +0100 |
| 28 |
-Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression |
| 29 |
- |
| 30 |
-add_trusted_domain() should only reject domains |
| 31 |
-based on is_allowed_domain(), which now also |
| 32 |
-checks "allow trusted domains = no", if we don't |
| 33 |
-have an explicit trust to the domain (SEC_CHAN_NULL). |
| 34 |
- |
| 35 |
-We use at least SEC_CHAN_LOCAL for local domains like |
| 36 |
-BUILTIN. |
| 37 |
- |
| 38 |
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899 |
| 39 |
- |
| 40 |
-Signed-off-by: Stefan Metzmacher <metze@×××××.org> |
| 41 |
-Reviewed-by: Andreas Schneider <asn@×××××.org> |
| 42 |
- |
| 43 |
-Autobuild-User(master): Stefan Metzmacher <metze@×××××.org> |
| 44 |
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184 |
| 45 |
- |
| 46 |
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935) |
| 47 |
---- |
| 48 |
- source3/winbindd/winbindd_util.c | 2 +- |
| 49 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 50 |
- |
| 51 |
-diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c |
| 52 |
-index 42ddbfd2f44e..9d54e462c425 100644 |
| 53 |
---- a/source3/winbindd/winbindd_util.c |
| 54 |
-+++ b/source3/winbindd/winbindd_util.c |
| 55 |
-@@ -134,7 +134,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name, |
| 56 |
- return NT_STATUS_INVALID_PARAMETER; |
| 57 |
- } |
| 58 |
- |
| 59 |
-- if (!is_allowed_domain(domain_name)) { |
| 60 |
-+ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) { |
| 61 |
- return NT_STATUS_NO_SUCH_DOMAIN; |
| 62 |
- } |
| 63 |
- |
| 64 |
--- |
| 65 |
-2.25.1 |
| 66 |
- |
| 67 |
|
| 68 |
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 |
| 69 |
deleted file mode 100644 |
| 70 |
index 457bad16a6e2..000000000000 |
| 71 |
--- a/net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,42 +0,0 @@ |
| 74 |
-From 9f73f8a784f2de9211601f92729a47aaa3e51a1a Mon Sep 17 00:00:00 2001 |
| 75 |
-From: Stefan Metzmacher <metze@×××××.org> |
| 76 |
-Date: Tue, 9 Nov 2021 20:50:20 +0100 |
| 77 |
-Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression |
| 78 |
- |
| 79 |
-add_trusted_domain() should only reject domains |
| 80 |
-based on is_allowed_domain(), which now also |
| 81 |
-checks "allow trusted domains = no", if we don't |
| 82 |
-have an explicit trust to the domain (SEC_CHAN_NULL). |
| 83 |
- |
| 84 |
-We use at least SEC_CHAN_LOCAL for local domains like |
| 85 |
-BUILTIN. |
| 86 |
- |
| 87 |
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899 |
| 88 |
- |
| 89 |
-Signed-off-by: Stefan Metzmacher <metze@×××××.org> |
| 90 |
-Reviewed-by: Andreas Schneider <asn@×××××.org> |
| 91 |
- |
| 92 |
-Autobuild-User(master): Stefan Metzmacher <metze@×××××.org> |
| 93 |
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184 |
| 94 |
- |
| 95 |
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935) |
| 96 |
---- |
| 97 |
- source3/winbindd/winbindd_util.c | 2 +- |
| 98 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 99 |
- |
| 100 |
-diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c |
| 101 |
-index fe68adec534a..a8c510fafc67 100644 |
| 102 |
---- a/source3/winbindd/winbindd_util.c |
| 103 |
-+++ b/source3/winbindd/winbindd_util.c |
| 104 |
-@@ -135,7 +135,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name, |
| 105 |
- return NT_STATUS_INVALID_PARAMETER; |
| 106 |
- } |
| 107 |
- |
| 108 |
-- if (!is_allowed_domain(domain_name)) { |
| 109 |
-+ if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) { |
| 110 |
- return NT_STATUS_NO_SUCH_DOMAIN; |
| 111 |
- } |
| 112 |
- |
| 113 |
--- |
| 114 |
-2.25.1 |
| 115 |
- |
Archives