diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
| commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
| tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /net-fs/samba/files | |
| parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) | |
gentoo resync : 06.04.2022
Diffstat (limited to 'net-fs/samba/files')
| -rw-r--r-- | net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch | 42 | ||||
| -rw-r--r-- | net-fs/samba/files/samba-4.15.2-winbindd_regression_fix.patch | 42 |
2 files changed, 0 insertions, 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 - |