From: Volker Lendecke <vl@samba.org>
Date: Thu, 3 Jul 2008 02:59:36 +0000 (+0200)
Subject: Simplify idmap_cache_set() a bit
X-Git-Tag: samba-3.3.0pre1~680
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55b976ba93462c6885e8d89edd13c32fb5529944;p=thirdparty%2Fsamba.git

Simplify idmap_cache_set() a bit

sid_check_is_in_unix_* will only give true if it is of the corresponding type,
so the check if the struct idmap actually represents a user or group is
unnecessary.
---

diff --git a/source/winbindd/idmap_cache.c b/source/winbindd/idmap_cache.c
index 0b3c22eb20d..eaff30c4e11 100644
--- a/source/winbindd/idmap_cache.c
+++ b/source/winbindd/idmap_cache.c
@@ -95,14 +95,9 @@ 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 ( (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) )
-	{
+
+	if (sid_check_is_in_unix_users(id->sid)
+	    || sid_check_is_in_unix_groups(id->sid)) {
 		return NT_STATUS_OK;
 	}