Check error returns from strupper_m() (in all reasonable places).
[kai/samba.git] / source3 / passdb / lookup_sid.c
index a5c2d503662da13ea85d4445f7d7a144be577844..a2d793feb32157eb4939a76ac337b134cca78e66 100644 (file)
@@ -4,22 +4,30 @@
    Copyright (C) Andrew Tridgell         1992-1998
    Copyright (C) Gerald (Jerry) Carter   2003
    Copyright (C) Volker Lendecke        2005
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "passdb.h"
+#include "../librpc/gen_ndr/ndr_security.h"
+#include "secrets.h"
+#include "memcache.h"
+#include "idmap_cache.h"
+#include "../libcli/security/security.h"
+#include "lib/winbind_util.h"
+#include "../librpc/gen_ndr/idmap.h"
 
 /*****************************************************************
  Dissect a user-provided name into domain, name, sid and type.
 bool lookup_name(TALLOC_CTX *mem_ctx,
                 const char *full_name, int flags,
                 const char **ret_domain, const char **ret_name,
-                DOM_SID *ret_sid, enum lsa_SidType *ret_type)
+                struct dom_sid *ret_sid, enum lsa_SidType *ret_type)
 {
        char *p;
        const char *tmp;
        const char *domain = NULL;
        const char *name = NULL;
        uint32 rid;
-       DOM_SID sid;
+       struct dom_sid sid;
        enum lsa_SidType type;
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
@@ -65,7 +73,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                return false;
        }
 
-       DEBUG(10,("lookup_name: %s => %s (domain), %s (name)\n",
+       DEBUG(10,("lookup_name: %s => domain=[%s], name=[%s]\n",
                full_name, domain, name));
        DEBUG(10, ("lookup_name: flags = 0x0%x\n", flags));
 
@@ -75,8 +83,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
 
                /* It's our own domain, lookup the name in passdb */
                if (lookup_global_sam_name(name, flags, &rid, &type)) {
-                       sid_copy(&sid, get_global_sam_sid());
-                       sid_append_rid(&sid, rid);
+                       sid_compose(&sid, get_global_sam_sid(), rid);
                        goto ok;
                }
                TALLOC_FREE(tmp_ctx);
@@ -86,10 +93,17 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
        if ((flags & LOOKUP_NAME_BUILTIN) &&
            strequal(domain, builtin_domain_name()))
        {
+               if (strlen(name) == 0) {
+                       /* Swap domain and name */
+                       tmp = name; name = domain; domain = tmp;
+                       sid_copy(&sid, &global_sid_Builtin);
+                       type = SID_NAME_DOMAIN;
+                       goto ok;
+               }
+
                /* Explicit request for a name in BUILTIN */
                if (lookup_builtin_name(name, &rid)) {
-                       sid_copy(&sid, &global_sid_Builtin);
-                       sid_append_rid(&sid, rid);
+                       sid_compose(&sid, &global_sid_Builtin, rid);
                        type = SID_NAME_ALIAS;
                        goto ok;
                }
@@ -106,7 +120,8 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                        goto ok;
        }
 
-       if (!(flags & LOOKUP_NAME_EXPLICIT) && strequal(domain, unix_users_domain_name())) {
+       if (((flags & LOOKUP_NAME_NO_NSS) == 0)
+           && strequal(domain, unix_users_domain_name())) {
                if (lookup_unix_user_name(name, &sid)) {
                        type = SID_NAME_USER;
                        goto ok;
@@ -115,7 +130,8 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                return false;
        }
 
-       if (!(flags & LOOKUP_NAME_EXPLICIT) && strequal(domain, unix_groups_domain_name())) {
+       if (((flags & LOOKUP_NAME_NO_NSS) == 0)
+           && strequal(domain, unix_groups_domain_name())) {
                if (lookup_unix_group_name(name, &sid)) {
                        type = SID_NAME_DOM_GRP;
                        goto ok;
@@ -205,8 +221,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
            lookup_builtin_name(name, &rid))
        {
                domain = talloc_strdup(tmp_ctx, builtin_domain_name());
-               sid_copy(&sid, &global_sid_Builtin);
-               sid_append_rid(&sid, rid);
+               sid_compose(&sid, &global_sid_Builtin, rid);
                type = SID_NAME_ALIAS;
                goto ok;
        }
@@ -220,8 +235,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
            lookup_global_sam_name(name, flags, &rid, &type))
        {
                domain = talloc_strdup(tmp_ctx, get_global_sam_name());
-               sid_copy(&sid, get_global_sam_sid());
-               sid_append_rid(&sid, rid);
+               sid_compose(&sid, get_global_sam_sid(), rid);
                goto ok;
        }
 
@@ -247,10 +261,9 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
         * that (yet), but give it a chance. */
 
        if (IS_DC && winbind_lookup_name("", name, &sid, &type)) {
-               DOM_SID dom_sid;
-               uint32 tmp_rid;
+               struct dom_sid dom_sid;
                enum lsa_SidType domain_type;
-               
+
                if (type == SID_NAME_DOMAIN) {
                        /* Swap name and type */
                        tmp = name; name = domain; domain = tmp;
@@ -262,7 +275,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                 * domain it figured out itself. Maybe fix that later... */
 
                sid_copy(&dom_sid, &sid);
-               sid_split_rid(&dom_sid, &tmp_rid);
+               sid_split_rid(&dom_sid, NULL);
 
                if (!winbind_lookup_sid(tmp_ctx, &dom_sid, &domain, NULL,
                                        &domain_type) ||
@@ -280,13 +293,15 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
        /* 11. Ok, windows would end here. Samba has two more options:
                Unmapped users and unmapped groups */
 
-       if (!(flags & LOOKUP_NAME_EXPLICIT) && lookup_unix_user_name(name, &sid)) {
+       if (((flags & LOOKUP_NAME_NO_NSS) == 0)
+           && lookup_unix_user_name(name, &sid)) {
                domain = talloc_strdup(tmp_ctx, unix_users_domain_name());
                type = SID_NAME_USER;
                goto ok;
        }
 
-       if (!(flags & LOOKUP_NAME_EXPLICIT) && lookup_unix_group_name(name, &sid)) {
+       if (((flags & LOOKUP_NAME_NO_NSS) == 0)
+           && lookup_unix_group_name(name, &sid)) {
                domain = talloc_strdup(tmp_ctx, unix_groups_domain_name());
                type = SID_NAME_DOM_GRP;
                goto ok;
@@ -324,7 +339,10 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(tmp_ctx);
                        return false;
                }
-               strupper_m(tmp_dom);
+               if (!strupper_m(tmp_dom)) {
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
+               }
                *ret_domain = tmp_dom;
        }
 
@@ -349,7 +367,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
 bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                 const char *full_name, int flags,
                 const char **ret_domain, const char **ret_name,
-                DOM_SID *ret_sid, enum lsa_SidType *ret_type)
+                struct dom_sid *ret_sid, enum lsa_SidType *ret_type)
 {
        char *qualified_name;
        const char *p;
@@ -390,7 +408,7 @@ bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                                ret_sid, ret_type)) {
                return true;
        }
-       
+
        /* Finally try with "Unix Users" or "Unix Group" */
        qualified_name = talloc_asprintf(mem_ctx, "%s\\%s",
                                flags & LOOKUP_NAME_GROUP ?
@@ -407,7 +425,7 @@ bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
 }
 
 static bool wb_lookup_rids(TALLOC_CTX *mem_ctx,
-                          const DOM_SID *domain_sid,
+                          const struct dom_sid *domain_sid,
                           int num_rids, uint32 *rids,
                           const char **domain_name,
                           const char **names, enum lsa_SidType *types)
@@ -457,7 +475,7 @@ static bool wb_lookup_rids(TALLOC_CTX *mem_ctx,
        return true;
 }
 
-static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
+static bool lookup_rids(TALLOC_CTX *mem_ctx, const struct dom_sid *domain_sid,
                        int num_rids, uint32_t *rids,
                        const char **domain_name,
                        const char ***names, enum lsa_SidType **types)
@@ -468,18 +486,21 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                   sid_string_dbg(domain_sid)));
 
        if (num_rids) {
-               *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
-               *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+               *names = talloc_zero_array(mem_ctx, const char *, num_rids);
+               *types = talloc_array(mem_ctx, enum lsa_SidType, num_rids);
 
                if ((*names == NULL) || (*types == NULL)) {
                        return false;
                }
+
+               for (i = 0; i < num_rids; i++)
+                       (*types)[i] = SID_NAME_UNKNOWN;
        } else {
                *names = NULL;
                *types = NULL;
        }
 
-       if (sid_check_is_domain(domain_sid)) {
+       if (sid_check_is_our_sam(domain_sid)) {
                NTSTATUS result;
 
                if (*domain_name == NULL) {
@@ -528,9 +549,8 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
 
        if (sid_check_is_wellknown_domain(domain_sid, NULL)) {
                for (i=0; i<num_rids; i++) {
-                       DOM_SID sid;
-                       sid_copy(&sid, domain_sid);
-                       sid_append_rid(&sid, rids[i]);
+                       struct dom_sid sid;
+                       sid_compose(&sid, domain_sid, rids[i]);
                        if (lookup_wellknown_sid(mem_ctx, &sid,
                                                 domain_name, &(*names)[i])) {
                                if ((*names)[i] == NULL) {
@@ -590,13 +610,13 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
  * Is the SID a domain as such? If yes, lookup its name.
  */
 
-static bool lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
+static bool lookup_as_domain(const struct dom_sid *sid, TALLOC_CTX *mem_ctx,
                             const char **name)
 {
        const char *tmp;
        enum lsa_SidType type;
 
-       if (sid_check_is_domain(sid)) {
+       if (sid_check_is_our_sam(sid)) {
                *name = talloc_strdup(mem_ctx, get_global_sam_name());
                return true;
        }
@@ -641,7 +661,7 @@ static bool lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
                }
 
                for (i=0; i<num_domains; i++) {
-                       if (sid_equal(sid, &domains[i]->sid)) {
+                       if (dom_sid_equal(sid, &domains[i]->sid)) {
                                *name = talloc_strdup(mem_ctx,
                                                      domains[i]->name);
                                return true;
@@ -678,7 +698,7 @@ static bool lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
  * Level 6: Like 4
  */
 
-static bool check_dom_sid_to_level(const DOM_SID *sid, int level)
+static bool check_dom_sid_to_level(const struct dom_sid *sid, int level)
 {
        int ret = false;
 
@@ -693,7 +713,7 @@ static bool check_dom_sid_to_level(const DOM_SID *sid, int level)
        case 3:
        case 4:
        case 6:
-               ret = sid_check_is_domain(sid);
+               ret = sid_check_is_our_sam(sid);
                break;
        case 5:
                ret = false;
@@ -713,13 +733,11 @@ static bool check_dom_sid_to_level(const DOM_SID *sid, int level)
  * This attempts to be as efficient as possible: It collects all SIDs
  * belonging to a domain and hands them in bulk to the appropriate lookup
  * function. In particular pdb_lookup_rids with ldapsam_trusted benefits
- * *hugely* from this. Winbind is going to be extended with a lookup_rids
- * interface as well, so on a DC we can do a bulk lsa_lookuprids to the
- * appropriate DC.
+ * *hugely* from this.
  */
 
 NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
-                    const DOM_SID **sids, int level,
+                    const struct dom_sid **sids, int level,
                     struct lsa_dom_info **ret_domains,
                     struct lsa_name_info **ret_names)
 {
@@ -736,7 +754,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
        }
 
        if (num_sids) {
-               name_infos = TALLOC_ARRAY(mem_ctx, struct lsa_name_info, num_sids);
+               name_infos = talloc_array(mem_ctx, struct lsa_name_info, num_sids);
                if (name_infos == NULL) {
                        result = NT_STATUS_NO_MEMORY;
                        goto fail;
@@ -745,7 +763,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                name_infos = NULL;
        }
 
-       dom_infos = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_dom_info,
+       dom_infos = talloc_zero_array(mem_ctx, struct lsa_dom_info,
                                      LSA_REF_DOMAIN_LIST_MULTIPLIER);
        if (dom_infos == NULL) {
                result = NT_STATUS_NO_MEMORY;
@@ -767,8 +785,8 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
         */
 
        for (i=0; i<num_sids; i++) {
-               DOM_SID sid;
-               uint32 rid;
+               struct dom_sid sid;
+               uint32_t rid = 0;
                const char *domain_name = NULL;
 
                sid_copy(&sid, sids[i]);
@@ -786,7 +804,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                                result = NT_STATUS_NO_MEMORY;
                                goto fail;
                        }
-                               
+
                        name_infos[i].rid = 0;
                        name_infos[i].type = SID_NAME_DOMAIN;
                        name_infos[i].name = NULL;
@@ -820,7 +838,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                        if (!dom_infos[j].valid) {
                                break;
                        }
-                       if (sid_equal(&sid, &dom_infos[j].sid)) {
+                       if (dom_sid_equal(&sid, &dom_infos[j].sid)) {
                                break;
                        }
                }
@@ -882,7 +900,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                }
 
                if (dom->num_idxs) {
-                       if (!(rids = TALLOC_ARRAY(tmp_ctx, uint32, dom->num_idxs))) {
+                       if (!(rids = talloc_array(tmp_ctx, uint32, dom->num_idxs))) {
                                result = NT_STATUS_NO_MEMORY;
                                goto fail;
                        }
@@ -905,7 +923,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                        result = NT_STATUS_NO_MEMORY;
                        goto fail;
                }
-                       
+
                for (j=0; j<dom->num_idxs; j++) {
                        int idx = dom->idxs[j];
                        name_infos[idx].type = types[j];
@@ -938,7 +956,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
  *THE CANONICAL* convert SID to name function.
 *****************************************************************/  
 
-bool lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
+bool lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
                const char **ret_domain, const char **ret_name,
                enum lsa_SidType *ret_type)
 {
@@ -998,135 +1016,23 @@ bool lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
  modified to use linked lists by jra.
 *****************************************************************/  
 
-/*****************************************************************
-  Find a SID given a uid.
-*****************************************************************/
-
-static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, UID_SID_CACHE,
-                            data_blob_const(&uid, sizeof(uid)),
-                            &cache_value)) {
-               return false;
-       }
-
-       memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
-       SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
-       SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, NULL, 0));
-
-       return true;
-}
-
-/*****************************************************************
-  Find a uid given a SID.
-*****************************************************************/
-
-static bool fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, SID_UID_CACHE,
-                            data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
-                            &cache_value)) {
-               return false;
-       }
-
-       SMB_ASSERT(cache_value.length == sizeof(*puid));
-       memcpy(puid, cache_value.data, sizeof(*puid));
-
-       return true;
-}
-
-/*****************************************************************
- Store uid to SID mapping in cache.
-*****************************************************************/
-
-void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
-{
-       memcache_add(NULL, SID_UID_CACHE,
-                    data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
-                    data_blob_const(&uid, sizeof(uid)));
-       memcache_add(NULL, UID_SID_CACHE,
-                    data_blob_const(&uid, sizeof(uid)),
-                    data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)));
-}
-
-/*****************************************************************
-  Find a SID given a gid.
-*****************************************************************/
-
-static bool fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, GID_SID_CACHE,
-                            data_blob_const(&gid, sizeof(gid)),
-                            &cache_value)) {
-               return false;
-       }
-
-       memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
-       SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
-       SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, NULL, 0));
-
-       return true;
-}
-
-/*****************************************************************
-  Find a gid given a SID.
-*****************************************************************/
-
-static bool fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
-{
-       DATA_BLOB cache_value;
-
-       if (!memcache_lookup(NULL, SID_UID_CACHE,
-                            data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
-                            &cache_value)) {
-               return false;
-       }
-
-       SMB_ASSERT(cache_value.length == sizeof(*pgid));
-       memcpy(pgid, cache_value.data, sizeof(*pgid));
-
-       return true;
-}
-
-/*****************************************************************
- Store gid to SID mapping in cache.
-*****************************************************************/
-
-void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
-{
-       memcache_add(NULL, SID_GID_CACHE,
-                    data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
-                    data_blob_const(&gid, sizeof(gid)));
-       memcache_add(NULL, GID_SID_CACHE,
-                    data_blob_const(&gid, sizeof(gid)),
-                    data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)));
-}
 
 /*****************************************************************
  *THE LEGACY* convert uid_t to SID function.
 *****************************************************************/  
 
-static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
+static void legacy_uid_to_sid(struct dom_sid *psid, uid_t uid)
 {
-       uint32 rid;
        bool ret;
 
        ZERO_STRUCTP(psid);
 
        become_root();
-       ret = pdb_uid_to_rid(uid, &rid);
+       ret = pdb_uid_to_sid(uid, psid);
        unbecome_root();
 
        if (ret) {
                /* This is a mapped user */
-               sid_copy(psid, get_global_sam_sid());
-               sid_append_rid(psid, rid);
                goto done;
        }
 
@@ -1138,7 +1044,6 @@ static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
        DEBUG(10,("LEGACY: uid %u -> sid %s\n", (unsigned int)uid,
                  sid_string_dbg(psid)));
 
-       store_uid_sid_cache(psid, uid);
        return;
 }
 
@@ -1146,7 +1051,7 @@ static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
  *THE LEGACY* convert gid_t to SID function.
 *****************************************************************/  
 
-static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
+static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
 {
        bool ret;
 
@@ -1160,7 +1065,7 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
                /* This is a mapped group */
                goto done;
        }
-       
+
        /* This is an unmapped group */
 
        gid_to_unix_groups_sid(gid, psid);
@@ -1169,130 +1074,99 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
        DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
                  sid_string_dbg(psid)));
 
-       store_gid_sid_cache(psid, gid);
        return;
 }
 
 /*****************************************************************
- *THE LEGACY* convert SID to uid function.
+ *THE LEGACY* convert SID to id function.
 *****************************************************************/  
 
-static bool legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
+static bool legacy_sid_to_unixid(const struct dom_sid *psid, struct unixid *id)
 {
-       enum lsa_SidType type;
-       uint32 rid;
-
-       if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
-               union unid_t id;
+       GROUP_MAP *map;
+       if (sid_check_is_in_our_sam(psid)) {
                bool ret;
 
                become_root();
-               ret = pdb_sid_to_id(psid, &id, &type);
+               ret = pdb_sid_to_id(psid, id);
                unbecome_root();
 
                if (ret) {
-                       if (type != SID_NAME_USER) {
-                               DEBUG(5, ("sid %s is a %s, expected a user\n",
-                                         sid_string_dbg(psid),
-                                         sid_type_lookup(type)));
-                               return false;
-                       }
-                       *puid = id.uid;
                        goto done;
                }
 
                /* This was ours, but it was not mapped.  Fail */
        }
 
-       DEBUG(10,("LEGACY: mapping failed for sid %s\n",
-                 sid_string_dbg(psid)));
-       return false;
-
-done:
-       DEBUG(10,("LEGACY: sid %s -> uid %u\n", sid_string_dbg(psid),
-                 (unsigned int)*puid ));
-
-       store_uid_sid_cache(psid, *puid);
-       return true;
-}
-
-/*****************************************************************
- *THE LEGACY* convert SID to gid function.
- Group mapping is used for gids that maps to Wellknown SIDs
-*****************************************************************/  
-
-static bool legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
-{
-       uint32 rid;
-       GROUP_MAP map;
-       union unid_t id;
-       enum lsa_SidType type;
-
        if ((sid_check_is_in_builtin(psid) ||
             sid_check_is_in_wellknown_domain(psid))) {
                bool ret;
 
+               map = talloc_zero(NULL, GROUP_MAP);
+               if (!map) {
+                       return false;
+               }
+
                become_root();
-               ret = pdb_getgrsid(&map, *psid);
+               ret = pdb_getgrsid(map, *psid);
                unbecome_root();
 
                if (ret) {
-                       *pgid = map.gid;
+                       id->id = map->gid;
+                       id->type = ID_TYPE_GID;
+                       TALLOC_FREE(map);
                        goto done;
                }
+               TALLOC_FREE(map);
                DEBUG(10,("LEGACY: mapping failed for sid %s\n",
                          sid_string_dbg(psid)));
                return false;
        }
 
-       if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
-               bool ret;
-
-               become_root();
-               ret = pdb_sid_to_id(psid, &id, &type);
-               unbecome_root();
-
-               if (ret) {
-                       if ((type != SID_NAME_DOM_GRP) &&
-                           (type != SID_NAME_ALIAS)) {
-                               DEBUG(5, ("LEGACY: sid %s is a %s, expected "
-                                         "a group\n", sid_string_dbg(psid),
-                                         sid_type_lookup(type)));
-                               return false;
-                       }
-                       *pgid = id.gid;
-                       goto done;
-               }
-       
-               /* This was ours, but it was not mapped.  Fail */
-       }
-
        DEBUG(10,("LEGACY: mapping failed for sid %s\n",
                  sid_string_dbg(psid)));
        return false;
-       
- done:
-       DEBUG(10,("LEGACY: sid %s -> gid %u\n", sid_string_dbg(psid),
-                 (unsigned int)*pgid ));
-
-       store_gid_sid_cache(psid, *pgid);
 
+done:
        return true;
 }
 
+static bool legacy_sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
+{
+       struct unixid id;
+       if (!legacy_sid_to_unixid(psid, &id)) {
+               return false;
+       }
+       if (id.type == ID_TYPE_GID || id.type == ID_TYPE_BOTH) {
+               *pgid = id.id;
+               return true;
+       }
+       return false;
+}
+
+static bool legacy_sid_to_uid(const struct dom_sid *psid, uid_t *puid)
+{
+       struct unixid id;
+       if (!legacy_sid_to_unixid(psid, &id)) {
+               return false;
+       }
+       if (id.type == ID_TYPE_UID || id.type == ID_TYPE_BOTH) {
+               *puid = id.id;
+               return true;
+       }
+       return false;
+}
+
 /*****************************************************************
  *THE CANONICAL* convert uid_t to SID function.
 *****************************************************************/  
 
-void uid_to_sid(DOM_SID *psid, uid_t uid)
+void uid_to_sid(struct dom_sid *psid, uid_t uid)
 {
        bool expired = true;
        bool ret;
        ZERO_STRUCTP(psid);
 
-       if (fetch_sid_from_uid_cache(psid, uid))
-               return;
-
        /* Check the winbindd cache directly. */
        ret = idmap_cache_find_uid2sid(uid, psid, &expired);
 
@@ -1319,7 +1193,7 @@ void uid_to_sid(DOM_SID *psid, uid_t uid)
                         * the next time we ask.
                         */
                        DEBUG(5, ("uid_to_sid: winbind failed to find a sid "
-                                 "for uid %u\n", uid));
+                                 "for uid %u\n", (unsigned int)uid));
 
                        legacy_uid_to_sid(psid, uid);
                        return;
@@ -1329,7 +1203,6 @@ void uid_to_sid(DOM_SID *psid, uid_t uid)
        DEBUG(10,("uid %u -> sid %s\n", (unsigned int)uid,
                  sid_string_dbg(psid)));
 
-       store_uid_sid_cache(psid, uid);
        return;
 }
 
@@ -1337,15 +1210,12 @@ void uid_to_sid(DOM_SID *psid, uid_t uid)
  *THE CANONICAL* convert gid_t to SID function.
 *****************************************************************/  
 
-void gid_to_sid(DOM_SID *psid, gid_t gid)
+void gid_to_sid(struct dom_sid *psid, gid_t gid)
 {
        bool expired = true;
        bool ret;
        ZERO_STRUCTP(psid);
 
-       if (fetch_sid_from_gid_cache(psid, gid))
-               return;
-
        /* Check the winbindd cache directly. */
        ret = idmap_cache_find_gid2sid(gid, psid, &expired);
 
@@ -1372,7 +1242,7 @@ void gid_to_sid(DOM_SID *psid, gid_t gid)
                         * the next time we ask.
                         */
                        DEBUG(5, ("gid_to_sid: winbind failed to find a sid "
-                                 "for gid %u\n", gid));
+                                 "for gid %u\n", (unsigned int)gid));
 
                        legacy_gid_to_sid(psid, gid);
                        return;
@@ -1382,27 +1252,134 @@ void gid_to_sid(DOM_SID *psid, gid_t gid)
        DEBUG(10,("gid %u -> sid %s\n", (unsigned int)gid,
                  sid_string_dbg(psid)));
 
-       store_gid_sid_cache(psid, gid);
        return;
 }
 
+bool sids_to_unixids(const struct dom_sid *sids, uint32_t num_sids,
+                    struct unixid *ids)
+{
+       struct wbcDomainSid *wbc_sids = NULL;
+       struct wbcUnixId *wbc_ids = NULL;
+       uint32_t i, num_not_cached;
+       wbcErr err;
+       bool ret = false;
+
+       wbc_sids = talloc_array(talloc_tos(), struct wbcDomainSid, num_sids);
+       if (wbc_sids == NULL) {
+               return false;
+       }
+
+       num_not_cached = 0;
+
+       for (i=0; i<num_sids; i++) {
+               bool expired;
+               uint32_t rid;
+
+               if (sid_peek_check_rid(&global_sid_Unix_Users,
+                                      &sids[i], &rid)) {
+                       ids[i].type = ID_TYPE_UID;
+                       ids[i].id = rid;
+                       continue;
+               }
+               if (sid_peek_check_rid(&global_sid_Unix_Groups,
+                                      &sids[i], &rid)) {
+                       ids[i].type = ID_TYPE_GID;
+                       ids[i].id = rid;
+                       continue;
+               }
+               if (idmap_cache_find_sid2unixid(&sids[i], &ids[i], &expired)
+                   && !expired)
+               {
+                       continue;
+               }
+               ids[i].type = ID_TYPE_NOT_SPECIFIED;
+               memcpy(&wbc_sids[num_not_cached], &sids[i],
+                      ndr_size_dom_sid(&sids[i], 0));
+               num_not_cached += 1;
+       }
+       if (num_not_cached == 0) {
+               goto done;
+       }
+       wbc_ids = talloc_array(talloc_tos(), struct wbcUnixId, num_not_cached);
+       if (wbc_ids == NULL) {
+               goto fail;
+       }
+       for (i=0; i<num_not_cached; i++) {
+               wbc_ids[i].type = WBC_ID_TYPE_NOT_SPECIFIED;
+       }
+       err = wbcSidsToUnixIds(wbc_sids, num_not_cached, wbc_ids);
+       if (!WBC_ERROR_IS_OK(err)) {
+               DEBUG(10, ("wbcSidsToUnixIds returned %s\n",
+                          wbcErrorString(err)));
+       }
+
+       num_not_cached = 0;
+
+       for (i=0; i<num_sids; i++) {
+               if (ids[i].type == ID_TYPE_NOT_SPECIFIED) {
+                       switch (wbc_ids[num_not_cached].type) {
+                       case ID_TYPE_UID:
+                               ids[i].type = WBC_ID_TYPE_UID;
+                               ids[i].id = wbc_ids[num_not_cached].id.uid;
+                               break;
+                       case ID_TYPE_GID:
+                               ids[i].type = WBC_ID_TYPE_GID;
+                               ids[i].id = wbc_ids[num_not_cached].id.gid;
+                               break;
+                       default:
+                               /* The types match, and wbcUnixId -> id is a union anyway */
+                               ids[i].type = wbc_ids[num_not_cached].type;
+                               ids[i].id = wbc_ids[num_not_cached].id.gid;
+                               break;
+                       }
+                       num_not_cached += 1;
+               }
+       }
+
+       for (i=0; i<num_sids; i++) {
+               if (ids[i].type != ID_TYPE_NOT_SPECIFIED) {
+                       continue;
+               }
+               if (legacy_sid_to_gid(&sids[i], &ids[i].id)) {
+                       ids[i].type = ID_TYPE_GID;
+                       continue;
+               }
+               if (legacy_sid_to_uid(&sids[i], &ids[i].id)) {
+                       ids[i].type = ID_TYPE_UID;
+                       continue;
+               }
+       }
+done:
+       for (i=0; i<num_sids; i++) {
+               switch(ids[i].type) {
+               case WBC_ID_TYPE_GID:
+               case WBC_ID_TYPE_UID:
+               case WBC_ID_TYPE_BOTH:
+                       if (ids[i].id == -1) {
+                               ids[i].type = ID_TYPE_NOT_SPECIFIED;
+                       }
+                       break;
+               case WBC_ID_TYPE_NOT_SPECIFIED:
+                       break;
+               }
+       }
+
+       ret = true;
+fail:
+       TALLOC_FREE(wbc_ids);
+       TALLOC_FREE(wbc_sids);
+       return ret;
+}
+
 /*****************************************************************
  *THE CANONICAL* convert SID to uid function.
 *****************************************************************/  
 
-bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
+bool sid_to_uid(const struct dom_sid *psid, uid_t *puid)
 {
        bool expired = true;
        bool ret;
        uint32 rid;
-       gid_t gid;
-
-       if (fetch_uid_from_cache(puid, psid))
-               return true;
-
-       if (fetch_gid_from_cache(&gid, psid)) {
-               return false;
-       }
 
        /* Optimize for the Unix Users Domain
         * as the conversion is straightforward */
@@ -1430,13 +1407,10 @@ bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
        if (!ret || expired) {
                /* Not in cache. Ask winbindd. */
                if (!winbind_sid_to_uid(puid, psid)) {
-                       if (!winbind_ping()) {
-                               return legacy_sid_to_uid(psid, puid);
-                       }
-
                        DEBUG(5, ("winbind failed to find a uid for sid %s\n",
                                  sid_string_dbg(psid)));
-                       return false;
+                       /* winbind failed. do legacy */
+                       return legacy_sid_to_uid(psid, puid);
                }
        }
 
@@ -1446,7 +1420,6 @@ bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
        DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
                (unsigned int)*puid ));
 
-       store_uid_sid_cache(psid, *puid);
        return true;
 }
 
@@ -1455,18 +1428,11 @@ bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
  Group mapping is used for gids that maps to Wellknown SIDs
 *****************************************************************/  
 
-bool sid_to_gid(const DOM_SID *psid, gid_t *pgid)
+bool sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
 {
        bool expired = true;
        bool ret;
        uint32 rid;
-       uid_t uid;
-
-       if (fetch_gid_from_cache(pgid, psid))
-               return true;
-
-       if (fetch_uid_from_cache(&uid, psid))
-               return false;
 
        /* Optimize for the Unix Groups Domain
         * as the conversion is straightforward */
@@ -1497,19 +1463,141 @@ bool sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                 * (Idmap will check it is a valid SID and of the right type) */
 
                if ( !winbind_sid_to_gid(pgid, psid) ) {
-                       if (!winbind_ping()) {
-                               return legacy_sid_to_gid(psid, pgid);
-                       }
 
                        DEBUG(10,("winbind failed to find a gid for sid %s\n",
                                  sid_string_dbg(psid)));
-                       return false;
+                       /* winbind failed. do legacy */
+                       return legacy_sid_to_gid(psid, pgid);
                }
        }
 
        DEBUG(10,("sid %s -> gid %u\n", sid_string_dbg(psid),
                  (unsigned int)*pgid ));
 
-       store_gid_sid_cache(psid, *pgid);
        return true;
 }
+
+/**
+ * @brief This function gets the primary group SID mapping the primary
+ *        GID of the user as obtained by an actual getpwnam() call.
+ *        This is necessary to avoid issues with arbitrary group SIDs
+ *        stored in passdb. We try as hard as we can to get the SID
+ *        corresponding to the GID, including trying group mapping.
+ *        If nothing else works, we will force "Domain Users" as the
+ *        primary group.
+ *        This is needed because we must always be able to lookup the
+ *        primary group SID, so we cannot settle for an arbitrary SID.
+ *
+ *        This call can be expensive. Use with moderation.
+ *        If you have a "samu" struct around use pdb_get_group_sid()
+ *        instead as it does properly cache results.
+ *
+ * @param mem_ctx[in]     The memory context iused to allocate the result.
+ * @param username[in]    The user's name
+ * @param _pwd[in|out]    If available, pass in user's passwd struct.
+ *                        It will contain a tallocated passwd if NULL was
+ *                        passed in.
+ * @param _group_sid[out] The user's Primary Group SID
+ *
+ * @return NTSTATUS error code.
+ */
+NTSTATUS get_primary_group_sid(TALLOC_CTX *mem_ctx,
+                               const char *username,
+                               struct passwd **_pwd,
+                               struct dom_sid **_group_sid)
+{
+       TALLOC_CTX *tmp_ctx;
+       bool need_lookup_sid = false;
+       struct dom_sid *group_sid;
+       struct passwd *pwd = *_pwd;
+
+       tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (!pwd) {
+               pwd = Get_Pwnam_alloc(mem_ctx, username);
+               if (!pwd) {
+                       DEBUG(0, ("Failed to find a Unix account for %s",
+                                 username));
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_NO_SUCH_USER;
+               }
+       }
+
+       group_sid = talloc_zero(mem_ctx, struct dom_sid);
+       if (!group_sid) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       gid_to_sid(group_sid, pwd->pw_gid);
+       if (!is_null_sid(group_sid)) {
+               struct dom_sid domain_sid;
+               uint32_t rid;
+
+               /* We need a sid within our domain */
+               sid_copy(&domain_sid, group_sid);
+               sid_split_rid(&domain_sid, &rid);
+               if (dom_sid_equal(&domain_sid, get_global_sam_sid())) {
+                       /*
+                        * As shortcut for the expensive lookup_sid call
+                        * compare the domain sid part
+                        */
+                       switch (rid) {
+                       case DOMAIN_RID_ADMINS:
+                       case DOMAIN_RID_USERS:
+                               goto done;
+                       default:
+                               need_lookup_sid = true;
+                               break;
+                       }
+               } else {
+                       /* Try group mapping */
+                       ZERO_STRUCTP(group_sid);
+                       if (pdb_gid_to_sid(pwd->pw_gid, group_sid)) {
+                               need_lookup_sid = true;
+                       }
+               }
+       }
+
+       /* We must verify that this is a valid SID that resolves to a
+        * group of the correct type */
+       if (need_lookup_sid) {
+               enum lsa_SidType type = SID_NAME_UNKNOWN;
+               bool lookup_ret;
+
+               DEBUG(10, ("do lookup_sid(%s) for group of user %s\n",
+                          sid_string_dbg(group_sid), username));
+
+               /* Now check that it's actually a domain group and
+                * not something else */
+               lookup_ret = lookup_sid(tmp_ctx, group_sid,
+                                       NULL, NULL, &type);
+
+               if (lookup_ret && (type == SID_NAME_DOM_GRP)) {
+                       goto done;
+               }
+
+               DEBUG(3, ("Primary group %s for user %s is"
+                         " a %s and not a domain group\n",
+                         sid_string_dbg(group_sid), username,
+                         sid_type_lookup(type)));
+       }
+
+       /* Everything else, failed.
+        * Just set it to the 'Domain Users' RID of 513 which will
+          always resolve to a name */
+       DEBUG(3, ("Forcing Primary Group to 'Domain Users' for %s\n",
+                 username));
+
+       sid_compose(group_sid, get_global_sam_sid(), DOMAIN_RID_USERS);
+
+done:
+       *_pwd = talloc_move(mem_ctx, &pwd);
+       *_group_sid = talloc_move(mem_ctx, &group_sid);
+       TALLOC_FREE(tmp_ctx);
+       return NT_STATUS_OK;
+}
+