From: Volker Lendecke <vl@samba.org>
Date: Fri, 11 Jul 2008 15:43:25 +0000 (+0200)
Subject: Revert "Simplify idmap_cache_set() a bit"
X-Git-Tag: samba-3.3.0pre1~577
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23edc4ec0ab1de60a864de01c0ff90ea1378231d;p=thirdparty%2Fsamba.git

Revert "Simplify idmap_cache_set() a bit"

This reverts commit 55b976ba93462c6885e8d89edd13c32fb5529944.
---

diff --git a/source/winbindd/idmap_cache.c b/source/winbindd/idmap_cache.c
index eaff30c4e11..0b3c22eb20d 100644
--- a/source/winbindd/idmap_cache.c
+++ b/source/winbindd/idmap_cache.c
@@ -95,9 +95,14 @@ NTSTATUS idmap_cache_set(struct idmap_cache_ctx *cache, const struct id_map *id)
 	char *valstr;
 
 	/* Don't cache lookups in the S-1-22-{1,2} domain */
-
-	if (sid_check_is_in_unix_users(id->sid)
-	    || sid_check_is_in_unix_groups(id->sid)) {
+	if ( (id->xid.type == ID_TYPE_UID) && 
+	     sid_check_is_in_unix_users(id->sid) )
+	{
+		return NT_STATUS_OK;
+	}
+	if ( (id->xid.type == ID_TYPE_GID) && 
+	     sid_check_is_in_unix_groups(id->sid) )
+	{
 		return NT_STATUS_OK;
 	}