From 60582d1fb47cb975790915c892b849dce8518d47 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 3 Jul 2008 04:59:36 +0200 Subject: 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. (This used to be commit 55b976ba93462c6885e8d89edd13c32fb5529944) --- source3/winbindd/idmap_cache.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/source3/winbindd/idmap_cache.c b/source3/winbindd/idmap_cache.c index 0b3c22eb20..eaff30c4e1 100644 --- a/source3/winbindd/idmap_cache.c +++ b/source3/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; } -- cgit