Attachment 6049 Details for Bug 7777 – Second part of fix.

[patch] Second part of fix.

0002-Second-part-of-fix-for-bug-7777-When-requesting-look.patch (text/plain), 2.38 KB, created by Jeremy Allison on 2010-11-05 14:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-11-05 14:16:25 UTC

Size: 2.38 KB

patch

obsolete

>From 3282985380f1f4d9a729ba6540631d8df9dc5186 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 5 Nov 2010 12:13:38 -0700
>Subject: [PATCH 2/2] Second part of fix for bug #7777 - When requesting lookups for BUILTIN sids, winbindd allocates new uids/gids in error.
>
>Ensure we return after calling passdb for SID lookups for which we are
>authoritative.
>
>Jeremy.
>---
> source3/winbindd/idmap_util.c |   31 +++++++++++++++++++++++++------
> 1 files changed, 25 insertions(+), 6 deletions(-)
>
>diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
>index 37b7ecb..783a401 100644
>--- a/source3/winbindd/idmap_util.c
>+++ b/source3/winbindd/idmap_util.c
>@@ -25,6 +25,23 @@
> #define DBGC_CLASS DBGC_IDMAP
> 
> /*****************************************************************
>+ Returns true if the request was for a specific domain, or
>+ for a sid we are authoritative for - BUILTIN, or our own domain.
>+*****************************************************************/  
>+
>+static bool is_specific_domain_request(const char *dom_name, DOM_SID *sid)
>+{
>+	if (dom_name && dom_name[0] != '\0') {
>+		return true;
>+	}
>+	if (sid_check_is_in_builtin(sid) ||
>+			sid_check_is_in_our_domain(sid)) {
>+		return true;
>+	}
>+	return false;
>+}
>+
>+/*****************************************************************
>  Returns the SID mapped to the given UID.
>  If mapping is not possible returns an error.
> *****************************************************************/  
>@@ -194,10 +211,11 @@ backend:
> 		goto done;
> 	}
> 
>-	if (dom_name[0] != '\0') {
>+	if (is_specific_domain_request(dom_name, sid)) {
> 		/*
>-		 * We had the task to go to a specific domain which
>-		 * could not answer our request. Fail.
>+		 * We had the task to go to a specific domain or
>+		 * a domain for which we are authoritative for and
>+		 * it could not answer our request. Fail.
> 		 */
> 		if (winbindd_use_idmap_cache()) {
> 			idmap_cache_set_sid2uid(sid, -1);
>@@ -275,10 +293,11 @@ backend:
> 		goto done;
> 	}
> 
>-	if (domname[0] != '\0') {
>+	if (is_specific_domain_request(domname, sid)) {
> 		/*
>-		 * We had the task to go to a specific domain which
>-		 * could not answer our request. Fail.
>+		 * We had the task to go to a specific domain or
>+		 * a domain for which we are authoritative for and
>+		 * it could not answer our request. Fail.
> 		 */
> 		if (winbindd_use_idmap_cache()) {
> 			idmap_cache_set_sid2uid(sid, -1);
>-- 
>1.7.3.1
>

Flags:

obnox: review+

Actions: View

Attachments on bug 7777: 6048 | 6049