Simplify idmap_cache_set() a bit
authorVolker Lendecke <vl@samba.org>
Thu, 3 Jul 2008 02:59:36 +0000 (04:59 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 3 Jul 2008 19:19:09 +0000 (21:19 +0200)
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.
(This used to be commit 55b976ba93462c6885e8d89edd13c32fb5529944)

source3/winbindd/idmap_cache.c

index 0b3c22eb20de8e12ed0436bb659a691d24e0845f..eaff30c4e112fb0ed41d90f723ee796c5116492d 100644 (file)
@@ -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;
        }