Attachment 13384 Details for Bug 12720 – Patch for 4.6 and 4.7 cherry-picked from master

[patch] Patch for 4.6 and 4.7 cherry-picked from master

bug12720-v46,v47.patch (text/plain), 1.82 KB, created by Ralph Böhme on 2017-07-14 13:12:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-07-14 13:12:21 UTC

Size: 1.82 KB

patch

obsolete

>From abc4cf0a0e05d0ed3af61d8ac075e82a74e93e97 Mon Sep 17 00:00:00 2001
>From: "Dustin L. Howett via samba-technical" <samba-technical@lists.samba.org>
>Date: Fri, 30 Jun 2017 16:10:01 -0700
>Subject: [PATCH] idmap_ad: Retry query_user exactly once if we get
> TLDAP_SERVER_DOWN
>
>All other ldap-querying methods in idmap_ad make a single retry attempt if they get
>TLDAP_SERVER_DOWN. This patch brings idmap_ad_query_user in line with that design.
>
>This fixes the symptom described in 12720 at the cost of an additional reconnect per
>failed lookup.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12720
>
>Signed-off-by: Dustin L. Howett <dustin@howett.net>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>(cherry picked from commit fe7020b0d1b6fe1ca9add4815e20c2e2262cb6c9)
>---
> source3/winbindd/idmap_ad.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
>diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
>index 5039e9b..2bee08a 100644
>--- a/source3/winbindd/idmap_ad.c
>+++ b/source3/winbindd/idmap_ad.c
>@@ -511,9 +511,26 @@ static NTSTATUS idmap_ad_query_user(struct idmap_domain *domain,
> 	return NT_STATUS_OK;
> }
> 
>+static NTSTATUS idmap_ad_query_user_retry(struct idmap_domain *domain,
>+				          struct wbint_userinfo *info)
>+{
>+	const NTSTATUS status_server_down =
>+		NT_STATUS_LDAP(TLDAP_RC_V(TLDAP_SERVER_DOWN));
>+	NTSTATUS status;
>+
>+	status = idmap_ad_query_user(domain, info);
>+
>+	if (NT_STATUS_EQUAL(status, status_server_down)) {
>+		TALLOC_FREE(domain->private_data);
>+		status = idmap_ad_query_user(domain, info);
>+	}
>+
>+	return status;
>+}
>+
> static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom)
> {
>-	dom->query_user = idmap_ad_query_user;
>+	dom->query_user = idmap_ad_query_user_retry;
> 	dom->private_data = NULL;
> 	return NT_STATUS_OK;
> }
>-- 
>2.9.4
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 12720: 13104 | 13105 | 13106 | 13108 | 13313 | 13314 | 13384