From: Volker Lendecke <vl@samba.org>
Date: Tue, 29 Jul 2008 07:04:17 +0000 (+0200)
Subject: Do not create a new mapping if a domain with an explicit config fails
X-Git-Tag: samba-3.3.0pre1~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c27de44269198e22c323191dd4762d1aab81b22;p=thirdparty%2Fsamba.git

Do not create a new mapping if a domain with an explicit config fails
---

diff --git a/source/winbindd/idmap_util.c b/source/winbindd/idmap_util.c
index 04d12944e25..2a6beca5a2a 100644
--- a/source/winbindd/idmap_util.c
+++ b/source/winbindd/idmap_util.c
@@ -174,6 +174,15 @@ backend:
 		goto done;
 	}
 
+	if (dom_name[0] != '\0') {
+		/*
+		 * We had the task to go to a specific domain which
+		 * could not answer our request. Fail.
+		 */
+		idmap_cache_set_sid2uid(sid, -1);
+		return NT_STATUS_NONE_MAPPED;
+	}
+
 	ret = idmap_new_mapping(sid, ID_TYPE_UID, &map.xid);
 
 	if (!NT_STATUS_IS_OK(ret)) {
@@ -236,6 +245,15 @@ backend:
 		goto done;
 	}
 
+	if (domname[0] != '\0') {
+		/*
+		 * We had the task to go to a specific domain which
+		 * could not answer our request. Fail.
+		 */
+		idmap_cache_set_sid2uid(sid, -1);
+		return NT_STATUS_NONE_MAPPED;
+	}
+
 	ret = idmap_new_mapping(sid, ID_TYPE_GID, &map.xid);
 
 	if (!NT_STATUS_IS_OK(ret)) {