Fix a bunch of compiler warnings about wrong format types.
[ira/wip.git] / source3 / passdb / lookup_sid.c
index 4640eb6ae5877c29264373ede608823fc593b07f..c1249f5eb4fa05fe94bcfa8161ac88429ab298aa 100644 (file)
@@ -3,10 +3,11 @@
    uid/user handling
    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 2 of the License, or
+   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,
@@ -15,8 +16,7 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
  to do guesswork.
 *****************************************************************/  
 
-BOOL lookup_name(TALLOC_CTX *mem_ctx,
+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 SID_NAME_USE *ret_type)
+                DOM_SID *ret_sid, enum lsa_SidType *ret_type)
 {
        char *p;
        const char *tmp;
@@ -40,12 +40,12 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        const char *name = NULL;
        uint32 rid;
        DOM_SID sid;
-       enum SID_NAME_USE type;
+       enum lsa_SidType type;
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
        if (tmp_ctx == NULL) {
                DEBUG(0, ("talloc_new failed\n"));
-               return False;
+               return false;
        }
 
        p = strchr_m(full_name, '\\');
@@ -61,22 +61,31 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        if ((domain == NULL) || (name == NULL)) {
                DEBUG(0, ("talloc failed\n"));
-               return False;
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
-       if (strequal(domain, get_global_sam_name())) {
+       DEBUG(10,("lookup_name: %s => %s (domain), %s (name)\n",
+               full_name, domain, name));
+       DEBUG(10, ("lookup_name: flags = 0x0%x\n", flags));
+
+       if ((flags & LOOKUP_NAME_DOMAIN) &&
+           strequal(domain, get_global_sam_name()))
+       {
 
                /* It's our own domain, lookup the name in passdb */
-               if (lookup_global_sam_name(name, &rid, &type)) {
+               if (lookup_global_sam_name(name, flags, &rid, &type)) {
                        sid_copy(&sid, get_global_sam_sid());
                        sid_append_rid(&sid, rid);
                        goto ok;
                }
-               goto failed;
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
-       if (strequal(domain, builtin_domain_name())) {
-
+       if ((flags & LOOKUP_NAME_BUILTIN) &&
+           strequal(domain, builtin_domain_name()))
+       {
                /* Explicit request for a name in BUILTIN */
                if (lookup_builtin_name(name, &rid)) {
                        sid_copy(&sid, &global_sid_Builtin);
@@ -84,20 +93,40 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                        type = SID_NAME_ALIAS;
                        goto ok;
                }
-               goto failed;
+               TALLOC_FREE(tmp_ctx);
+               return false;
+       }
+
+       /* Try the explicit winbind lookup first, don't let it guess the
+        * domain yet at this point yet. This comes later. */
+
+       if ((domain[0] != '\0') &&
+           (flags & ~(LOOKUP_NAME_DOMAIN|LOOKUP_NAME_ISOLATED)) &&
+           (winbind_lookup_name(domain, name, &sid, &type))) {
+                       goto ok;
+       }
+
+       if (!(flags & LOOKUP_NAME_EXPLICIT) && strequal(domain, unix_users_domain_name())) {
+               if (lookup_unix_user_name(name, &sid)) {
+                       type = SID_NAME_USER;
+                       goto ok;
+               }
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
-       if (domain[0] != '\0') {
-               /* An explicit domain name was given, here our last resort is
-                * winbind. */
-               if (winbind_lookup_name(domain, name, &sid, &type)) {
+       if (!(flags & LOOKUP_NAME_EXPLICIT) && strequal(domain, unix_groups_domain_name())) {
+               if (lookup_unix_group_name(name, &sid)) {
+                       type = SID_NAME_DOM_GRP;
                        goto ok;
                }
-               goto failed;
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
-       if (!(flags & LOOKUP_NAME_ISOLATED)) {
-               goto failed;
+       if ((domain[0] == '\0') && (!(flags & LOOKUP_NAME_ISOLATED))) {
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
        /* Now the guesswork begins, we haven't been given an explicit
@@ -107,16 +136,18 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* 1. well-known names */
 
+       if ((flags & LOOKUP_NAME_WKN) &&
+           lookup_wellknown_name(tmp_ctx, name, &sid, &domain))
        {
-               if (lookup_wellknown_name(tmp_ctx, name, &sid, &domain)) {
-                       type = SID_NAME_WKN_GRP;
-                       goto ok;
-               }
+               type = SID_NAME_WKN_GRP;
+               goto ok;
        }
 
        /* 2. Builtin domain as such */
 
-       if (strequal(name, builtin_domain_name())) {
+       if ((flags & (LOOKUP_NAME_BUILTIN|LOOKUP_NAME_REMOTE)) &&
+           strequal(name, builtin_domain_name()))
+       {
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
                sid_copy(&sid, &global_sid_Builtin);
@@ -126,10 +157,13 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* 3. Account domain */
 
-       if (strequal(name, get_global_sam_name())) {
+       if ((flags & LOOKUP_NAME_DOMAIN) &&
+           strequal(name, get_global_sam_name()))
+       {
                if (!secrets_fetch_domain_sid(name, &sid)) {
                        DEBUG(3, ("Could not fetch my SID\n"));
-                       goto failed;
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
                }
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
@@ -139,10 +173,13 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* 4. Primary domain */
 
-       if (!IS_DC && strequal(name, lp_workgroup())) {
+       if ((flags & LOOKUP_NAME_DOMAIN) && !IS_DC &&
+           strequal(name, lp_workgroup()))
+       {
                if (!secrets_fetch_domain_sid(name, &sid)) {
                        DEBUG(3, ("Could not fetch the domain SID\n"));
-                       goto failed;
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
                }
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
@@ -153,8 +190,9 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        /* 5. Trusted domains as such, to me it looks as if members don't do
               this, tested an XP workstation in a NT domain -- vl */
 
-       if (IS_DC && (secrets_fetch_trusted_domain_password(name, NULL,
-                                                           &sid, NULL))) {
+       if ((flags & LOOKUP_NAME_REMOTE) && IS_DC &&
+           (pdb_get_trusteddom_pw(name, NULL, &sid, NULL)))
+       {
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
                type = SID_NAME_DOMAIN;
@@ -163,7 +201,9 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* 6. Builtin aliases */        
 
-       if (lookup_builtin_name(name, &rid)) {
+       if ((flags & LOOKUP_NAME_BUILTIN) &&
+           lookup_builtin_name(name, &rid))
+       {
                domain = talloc_strdup(tmp_ctx, builtin_domain_name());
                sid_copy(&sid, &global_sid_Builtin);
                sid_append_rid(&sid, rid);
@@ -176,7 +216,9 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* Both cases are done by looking at our passdb */
 
-       if (lookup_global_sam_name(name, &rid, &type)) {
+       if ((flags & LOOKUP_NAME_DOMAIN) &&
+           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);
@@ -186,7 +228,8 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        /* Now our local possibilities are exhausted. */
 
        if (!(flags & LOOKUP_NAME_REMOTE)) {
-               goto failed;
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
        /* If we are not a DC, we have to ask in our primary domain. Let
@@ -206,7 +249,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        if (IS_DC && winbind_lookup_name("", name, &sid, &type)) {
                DOM_SID dom_sid;
                uint32 tmp_rid;
-               enum SID_NAME_USE domain_type;
+               enum lsa_SidType domain_type;
                
                if (type == SID_NAME_DOMAIN) {
                        /* Swap name and type */
@@ -226,31 +269,63 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                    (domain_type != SID_NAME_DOMAIN)) {
                        DEBUG(2, ("winbind could not find the domain's name "
                                  "it just looked up for us\n"));
-                       goto failed;
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
                }
                goto ok;
        }
 
        /* 10. Don't translate */
- failed:
-       talloc_free(tmp_ctx);
-       return False;
+
+       /* 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)) {
+               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)) {
+               domain = talloc_strdup(tmp_ctx, unix_groups_domain_name());
+               type = SID_NAME_DOM_GRP;
+               goto ok;
+       }
+
+       /*
+        * Ok, all possibilities tried. Fail.
+        */
+
+       TALLOC_FREE(tmp_ctx);
+       return false;
 
  ok:
        if ((domain == NULL) || (name == NULL)) {
                DEBUG(0, ("talloc failed\n"));
-               talloc_free(tmp_ctx);
-               return False;
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
-       if (ret_name != NULL) {
-               *ret_name = talloc_steal(mem_ctx, name);
+       /*
+        * Hand over the results to the talloc context we've been given.
+        */
+
+       if ((ret_name != NULL) &&
+           !(*ret_name = talloc_strdup(mem_ctx, name))) {
+               DEBUG(0, ("talloc failed\n"));
+               TALLOC_FREE(tmp_ctx);
+               return false;
        }
 
        if (ret_domain != NULL) {
-               char *tmp_dom = talloc_strdup(tmp_ctx, domain);
+               char *tmp_dom;
+               if (!(tmp_dom = talloc_strdup(mem_ctx, domain))) {
+                       DEBUG(0, ("talloc failed\n"));
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
+               }
                strupper_m(tmp_dom);
-               *ret_domain = talloc_steal(mem_ctx, tmp_dom);
+               *ret_domain = tmp_dom;
        }
 
        if (ret_sid != NULL) {
@@ -261,117 +336,658 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                *ret_type = type;
        }
 
-       talloc_free(tmp_ctx);
-       return True;
+       TALLOC_FREE(tmp_ctx);
+       return true;
 }
 
-/*****************************************************************
- *THE CANONICAL* convert SID to name function.
- Tries local lookup first - for local sids, then tries winbind.
-*****************************************************************/  
+/************************************************************************
+ Names from smb.conf can be unqualified. eg. valid users = foo
+ These names should never map to a remote name. Try global_sam_name()\foo,
+ and then "Unix Users"\foo (or "Unix Groups"\foo).
+************************************************************************/
 
-BOOL lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
-               const char **ret_domain, const char **ret_name,
-               enum SID_NAME_USE *ret_type)
+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)
 {
-       const char *domain = NULL;
-       const char *name = NULL;
-       enum SID_NAME_USE type;
-       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       char *qualified_name;
+       const char *p;
 
-       /* Check if this is our own sid.  This should perhaps be done by
-          winbind?  For the moment handle it here. */
+       /* NB. No winbindd_separator here as lookup_name needs \\' */
+       if ((p = strchr_m(full_name, *lp_winbind_separator())) != NULL) {
 
-       if (tmp_ctx == NULL) {
-               DEBUG(0, ("talloc_new failed\n"));
-               return False;
+               /* The name is already qualified with a domain. */
+
+               if (*lp_winbind_separator() != '\\') {
+                       char *tmp;
+
+                       /* lookup_name() needs '\\' as a separator */
+
+                       tmp = talloc_strdup(mem_ctx, full_name);
+                       if (!tmp) {
+                               return false;
+                       }
+                       tmp[p - full_name] = '\\';
+                       full_name = tmp;
+               }
+
+               return lookup_name(mem_ctx, full_name, flags,
+                               ret_domain, ret_name,
+                               ret_sid, ret_type);
        }
 
-       if (sid_check_is_domain(sid)) {
-               domain = talloc_strdup(tmp_ctx, get_global_sam_name());
-               name = talloc_strdup(tmp_ctx, "");
-               type = SID_NAME_DOMAIN;
-               goto ok;
+       /* Try with our own SAM name. */
+       qualified_name = talloc_asprintf(mem_ctx, "%s\\%s",
+                               get_global_sam_name(),
+                               full_name );
+       if (!qualified_name) {
+               return false;
        }
 
-       if (sid_check_is_in_our_domain(sid)) {
-               uint32 rid;
-               SMB_ASSERT(sid_peek_rid(sid, &rid));
+       if (lookup_name(mem_ctx, qualified_name, flags,
+                               ret_domain, ret_name,
+                               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 ?
+                                       unix_groups_domain_name() :
+                                       unix_users_domain_name(),
+                               full_name );
+       if (!qualified_name) {
+               return false;
+       }
 
-               /* For our own domain passdb is responsible */
-               if (!lookup_global_sam_rid(tmp_ctx, rid, &name, &type)) {
-                       goto failed;
+       return lookup_name(mem_ctx, qualified_name, flags,
+                               ret_domain, ret_name,
+                               ret_sid, ret_type);
+}
+
+static bool wb_lookup_rids(TALLOC_CTX *mem_ctx,
+                          const DOM_SID *domain_sid,
+                          int num_rids, uint32 *rids,
+                          const char **domain_name,
+                          const char **names, enum lsa_SidType *types)
+{
+       int i;
+       const char **my_names;
+       enum lsa_SidType *my_types;
+       TALLOC_CTX *tmp_ctx;
+
+       if (!(tmp_ctx = talloc_init("wb_lookup_rids"))) {
+               return false;
+       }
+
+       if (!winbind_lookup_rids(tmp_ctx, domain_sid, num_rids, rids,
+                                domain_name, &my_names, &my_types)) {
+               *domain_name = "";
+               for (i=0; i<num_rids; i++) {
+                       names[i] = "";
+                       types[i] = SID_NAME_UNKNOWN;
                }
+               TALLOC_FREE(tmp_ctx);
+               return true;
+       }
 
-               domain = talloc_strdup(tmp_ctx, get_global_sam_name());
-               goto ok;
+       if (!(*domain_name = talloc_strdup(mem_ctx, *domain_name))) {
+               TALLOC_FREE(tmp_ctx);
+               return false;
+       }
+
+       /*
+        * winbind_lookup_rids allocates its own array. We've been given the
+        * array, so copy it over
+        */
+
+       for (i=0; i<num_rids; i++) {
+               if (my_names[i] == NULL) {
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
+               }
+               if (!(names[i] = talloc_strdup(names, my_names[i]))) {
+                       TALLOC_FREE(tmp_ctx);
+                       return false;
+               }
+               types[i] = my_types[i];
+       }
+       TALLOC_FREE(tmp_ctx);
+       return true;
+}
+
+static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
+                       int num_rids, uint32_t *rids,
+                       const char **domain_name,
+                       const char ***names, enum lsa_SidType **types)
+{
+       int i;
+
+       DEBUG(10, ("lookup_rids called for domain sid '%s'\n",
+                  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);
+
+               if ((*names == NULL) || (*types == NULL)) {
+                       return false;
+               }
+       } else {
+               *names = NULL;
+               *types = NULL;
+       }
+
+       if (sid_check_is_domain(domain_sid)) {
+               NTSTATUS result;
+
+               if (*domain_name == NULL) {
+                       *domain_name = talloc_strdup(
+                               mem_ctx, get_global_sam_name());
+               }
+
+               if (*domain_name == NULL) {
+                       return false;
+               }
+
+               become_root();
+               result = pdb_lookup_rids(domain_sid, num_rids, rids,
+                                        *names, *types);
+               unbecome_root();
+
+               return (NT_STATUS_IS_OK(result) ||
+                       NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) ||
+                       NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED));
+       }
+
+       if (sid_check_is_builtin(domain_sid)) {
+
+               if (*domain_name == NULL) {
+                       *domain_name = talloc_strdup(
+                               mem_ctx, builtin_domain_name());
+               }
+
+               if (*domain_name == NULL) {
+                       return false;
+               }
+
+               for (i=0; i<num_rids; i++) {
+                       if (lookup_builtin_rid(*names, rids[i],
+                                              &(*names)[i])) {
+                               if ((*names)[i] == NULL) {
+                                       return false;
+                               }
+                               (*types)[i] = SID_NAME_ALIAS;
+                       } else {
+                               (*types)[i] = SID_NAME_UNKNOWN;
+                       }
+               }
+               return true;
+       }
+
+       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]);
+                       if (lookup_wellknown_sid(mem_ctx, &sid,
+                                                domain_name, &(*names)[i])) {
+                               if ((*names)[i] == NULL) {
+                                       return false;
+                               }
+                               (*types)[i] = SID_NAME_WKN_GRP;
+                       } else {
+                               (*types)[i] = SID_NAME_UNKNOWN;
+                       }
+               }
+               return true;
+       }
+
+       if (sid_check_is_unix_users(domain_sid)) {
+               if (*domain_name == NULL) {
+                       *domain_name = talloc_strdup(
+                               mem_ctx, unix_users_domain_name());
+                       if (*domain_name == NULL) {
+                               return false;
+                       }
+               }
+               for (i=0; i<num_rids; i++) {
+                       (*names)[i] = talloc_strdup(
+                               (*names), uidtoname(rids[i]));
+                       if ((*names)[i] == NULL) {
+                               return false;
+                       }
+                       (*types)[i] = SID_NAME_USER;
+               }
+               return true;
+       }
+
+       if (sid_check_is_unix_groups(domain_sid)) {
+               if (*domain_name == NULL) {
+                       *domain_name = talloc_strdup(
+                               mem_ctx, unix_groups_domain_name());
+                       if (*domain_name == NULL) {
+                               return false;
+                       }
+               }
+               for (i=0; i<num_rids; i++) {
+                       (*names)[i] = talloc_strdup(
+                               (*names), gidtoname(rids[i]));
+                       if ((*names)[i] == NULL) {
+                               return false;
+                       }
+                       (*types)[i] = SID_NAME_DOM_GRP;
+               }
+               return true;
+       }
+
+       return wb_lookup_rids(mem_ctx, domain_sid, num_rids, rids,
+                             domain_name, *names, *types);
+}
+
+/*
+ * 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,
+                            const char **name)
+{
+       const char *tmp;
+       enum lsa_SidType type;
+
+       if (sid_check_is_domain(sid)) {
+               *name = talloc_strdup(mem_ctx, get_global_sam_name());
+               return true;
        }
 
        if (sid_check_is_builtin(sid)) {
+               *name = talloc_strdup(mem_ctx, builtin_domain_name());
+               return true;
+       }
 
-               domain = talloc_strdup(tmp_ctx, builtin_domain_name());
+       if (sid_check_is_wellknown_domain(sid, &tmp)) {
+               *name = talloc_strdup(mem_ctx, tmp);
+               return true;
+       }
 
-               /* Yes, W2k3 returns "BUILTIN" both as domain and name here */
-               name = talloc_strdup(tmp_ctx, builtin_domain_name());
-               type = SID_NAME_DOMAIN;
-               goto ok;
+       if (sid_check_is_unix_users(sid)) {
+               *name = talloc_strdup(mem_ctx, unix_users_domain_name());
+               return true;
        }
 
-       if (sid_check_is_in_builtin(sid)) {
-               uint32 rid;
+       if (sid_check_is_unix_groups(sid)) {
+               *name = talloc_strdup(mem_ctx, unix_groups_domain_name());
+               return true;
+       }
+
+       if (sid->num_auths != 4) {
+               /* This can't be a domain */
+               return false;
+       }
 
-               SMB_ASSERT(sid_peek_rid(sid, &rid));
+       if (IS_DC) {
+               uint32 i, num_domains;
+               struct trustdom_info **domains;
 
-               if (!lookup_builtin_rid(tmp_ctx, rid, &name)) {
-                       goto failed;
+               /* This is relatively expensive, but it happens only on DCs
+                * and for SIDs that have 4 sub-authorities and thus look like
+                * domains */
+
+               if (!NT_STATUS_IS_OK(pdb_enum_trusteddoms(mem_ctx,
+                                                         &num_domains,
+                                                         &domains))) {
+                       return false;
                }
 
-               /* There's only aliases in S-1-5-32 */
-               type = SID_NAME_ALIAS;
-               domain = talloc_strdup(tmp_ctx, builtin_domain_name());
+               for (i=0; i<num_domains; i++) {
+                       if (sid_equal(sid, &domains[i]->sid)) {
+                               *name = talloc_strdup(mem_ctx,
+                                                     domains[i]->name);
+                               return true;
+                       }
+               }
+               return false;
+       }
 
-               goto ok;
+       if (winbind_lookup_sid(mem_ctx, sid, &tmp, NULL, &type) &&
+           (type == SID_NAME_DOMAIN)) {
+               *name = tmp;
+               return true;
        }
 
-       if (winbind_lookup_sid(tmp_ctx, sid, &domain, &name, &type)) {
-               goto ok;
+       return false;
+}
+
+/*
+ * This tries to implement the rather weird rules for the lsa_lookup level
+ * parameter.
+ *
+ * This is as close as we can get to what W2k3 does. With this we survive the
+ * RPC-LSALOOKUP samba4 test as of 2006-01-08. NT4 as a PDC is a bit more
+ * different, but I assume that's just being too liberal. For example, W2k3
+ * replies to everything else but the levels 1-6 with INVALID_PARAMETER
+ * whereas NT4 does the same as level 1 (I think). I did not fully test that
+ * with NT4, this is what w2k3 does.
+ *
+ * Level 1: Ask everywhere
+ * Level 2: Ask domain and trusted domains, no builtin and wkn
+ * Level 3: Only ask domain
+ * Level 4: W2k3ad: Only ask AD trusts
+ * Level 5: Only ask transitive forest trusts
+ * Level 6: Like 4
+ */
+
+static bool check_dom_sid_to_level(const DOM_SID *sid, int level)
+{
+       int ret = false;
+
+       switch(level) {
+       case 1:
+               ret = true;
+               break;
+       case 2:
+               ret = (!sid_check_is_builtin(sid) &&
+                      !sid_check_is_wellknown_domain(sid, NULL));
+               break;
+       case 3:
+       case 4:
+       case 6:
+               ret = sid_check_is_domain(sid);
+               break;
+       case 5:
+               ret = false;
+               break;
        }
 
-       DEBUG(10,("lookup_sid: winbind lookup for SID %s failed - trying "
-                 "special SIDs.\n", sid_string_static(sid)));
+       DEBUG(10, ("%s SID %s in level %d\n",
+                  ret ? "Accepting" : "Rejecting",
+                  sid_string_dbg(sid), level));
+       return ret;
+}
 
-       if (lookup_wellknown_sid(tmp_ctx, sid, &domain, &name)) {
-               type = SID_NAME_WKN_GRP;
-               goto ok;
+/*
+ * Lookup a bunch of SIDs. This is modeled after lsa_lookup_sids with
+ * references to domains, it is explicitly made for this.
+ *
+ * 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.
+ */
+
+NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
+                    const DOM_SID **sids, int level,
+                    struct lsa_dom_info **ret_domains,
+                    struct lsa_name_info **ret_names)
+{
+       TALLOC_CTX *tmp_ctx;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       struct lsa_name_info *name_infos;
+       struct lsa_dom_info *dom_infos = NULL;
+
+       int i, j;
+
+       if (!(tmp_ctx = talloc_new(mem_ctx))) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (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;
+               }
+       } else {
+               name_infos = NULL;
        }
 
- failed:
-       DEBUG(10, ("Failed to lookup sid %s\n", sid_string_static(sid)));
-       talloc_free(tmp_ctx);
-       return False;
+       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;
+               goto fail;
+       }
 
- ok:
+       /* First build up the data structures:
+        * 
+        * dom_infos is a list of domains referenced in the list of
+        * SIDs. Later we will walk the list of domains and look up the RIDs
+        * in bulk.
+        *
+        * name_infos is a shadow-copy of the SIDs array to collect the real
+        * data.
+        *
+        * dom_info->idxs is an index into the name_infos array. The
+        * difficulty we have here is that we need to keep the SIDs the client
+        * asked for in the same order for the reply
+        */
 
-       if ((domain == NULL) || (name == NULL)) {
-               DEBUG(0, ("talloc failed\n"));
-               talloc_free(tmp_ctx);
-               return False;
+       for (i=0; i<num_sids; i++) {
+               DOM_SID sid;
+               uint32 rid;
+               const char *domain_name = NULL;
+
+               sid_copy(&sid, sids[i]);
+               name_infos[i].type = SID_NAME_USE_NONE;
+
+               if (lookup_as_domain(&sid, name_infos, &domain_name)) {
+                       /* We can't push that through the normal lookup
+                        * process, as this would reference illegal
+                        * domains.
+                        *
+                        * For example S-1-5-32 would end up referencing
+                        * domain S-1-5- with RID 32 which is clearly wrong.
+                        */
+                       if (domain_name == NULL) {
+                               result = NT_STATUS_NO_MEMORY;
+                               goto fail;
+                       }
+                               
+                       name_infos[i].rid = 0;
+                       name_infos[i].type = SID_NAME_DOMAIN;
+                       name_infos[i].name = NULL;
+
+                       if (sid_check_is_builtin(&sid)) {
+                               /* Yes, W2k3 returns "BUILTIN" both as domain
+                                * and name here */
+                               name_infos[i].name = talloc_strdup(
+                                       name_infos, builtin_domain_name());
+                               if (name_infos[i].name == NULL) {
+                                       result = NT_STATUS_NO_MEMORY;
+                                       goto fail;
+                               }
+                       }
+               } else {
+                       /* This is a normal SID with rid component */
+                       if (!sid_split_rid(&sid, &rid)) {
+                               result = NT_STATUS_INVALID_SID;
+                               goto fail;
+                       }
+               }
+
+               if (!check_dom_sid_to_level(&sid, level)) {
+                       name_infos[i].rid = 0;
+                       name_infos[i].type = SID_NAME_UNKNOWN;
+                       name_infos[i].name = NULL;
+                       continue;
+               }
+
+               for (j=0; j<LSA_REF_DOMAIN_LIST_MULTIPLIER; j++) {
+                       if (!dom_infos[j].valid) {
+                               break;
+                       }
+                       if (sid_equal(&sid, &dom_infos[j].sid)) {
+                               break;
+                       }
+               }
+
+               if (j == LSA_REF_DOMAIN_LIST_MULTIPLIER) {
+                       /* TODO: What's the right error message here? */
+                       result = NT_STATUS_NONE_MAPPED;
+                       goto fail;
+               }
+
+               if (!dom_infos[j].valid) {
+                       /* We found a domain not yet referenced, create a new
+                        * ref. */
+                       dom_infos[j].valid = true;
+                       sid_copy(&dom_infos[j].sid, &sid);
+
+                       if (domain_name != NULL) {
+                               /* This name was being found above in the case
+                                * when we found a domain SID */
+                               dom_infos[j].name =
+                                       talloc_strdup(dom_infos, domain_name);
+                               if (dom_infos[j].name == NULL) {
+                                       result = NT_STATUS_NO_MEMORY;
+                                       goto fail;
+                               }
+                       } else {
+                               /* lookup_rids will take care of this */
+                               dom_infos[j].name = NULL;
+                       }
+               }
+
+               name_infos[i].dom_idx = j;
+
+               if (name_infos[i].type == SID_NAME_USE_NONE) {
+                       name_infos[i].rid = rid;
+
+                       ADD_TO_ARRAY(dom_infos, int, i, &dom_infos[j].idxs,
+                                    &dom_infos[j].num_idxs);
+
+                       if (dom_infos[j].idxs == NULL) {
+                               result = NT_STATUS_NO_MEMORY;
+                               goto fail;
+                       }
+               }
        }
 
-       if (ret_domain != NULL) {
-               *ret_domain = talloc_steal(mem_ctx, domain);
+       /* Iterate over the domains found */
+
+       for (i=0; i<LSA_REF_DOMAIN_LIST_MULTIPLIER; i++) {
+               uint32_t *rids;
+               const char *domain_name = NULL;
+               const char **names;
+               enum lsa_SidType *types;
+               struct lsa_dom_info *dom = &dom_infos[i];
+
+               if (!dom->valid) {
+                       /* No domains left, we're done */
+                       break;
+               }
+
+               if (dom->num_idxs) {
+                       if (!(rids = TALLOC_ARRAY(tmp_ctx, uint32, dom->num_idxs))) {
+                               result = NT_STATUS_NO_MEMORY;
+                               goto fail;
+                       }
+               } else {
+                       rids = NULL;
+               }
+
+               for (j=0; j<dom->num_idxs; j++) {
+                       rids[j] = name_infos[dom->idxs[j]].rid;
+               }
+
+               if (!lookup_rids(tmp_ctx, &dom->sid,
+                                dom->num_idxs, rids, &domain_name,
+                                &names, &types)) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
+
+               if (!(dom->name = talloc_strdup(dom_infos, domain_name))) {
+                       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];
+                       if (types[j] != SID_NAME_UNKNOWN) {
+                               name_infos[idx].name =
+                                       talloc_strdup(name_infos, names[j]);
+                               if (name_infos[idx].name == NULL) {
+                                       result = NT_STATUS_NO_MEMORY;
+                                       goto fail;
+                               }
+                       } else {
+                               name_infos[idx].name = NULL;
+                       }
+               }
        }
 
-       if (ret_name != NULL) {
-               *ret_name = talloc_steal(mem_ctx, name);
+       *ret_domains = dom_infos;
+       *ret_names = name_infos;
+       TALLOC_FREE(tmp_ctx);
+       return NT_STATUS_OK;
+
+ fail:
+       TALLOC_FREE(dom_infos);
+       TALLOC_FREE(name_infos);
+       TALLOC_FREE(tmp_ctx);
+       return result;
+}
+
+/*****************************************************************
+ *THE CANONICAL* convert SID to name function.
+*****************************************************************/  
+
+bool lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
+               const char **ret_domain, const char **ret_name,
+               enum lsa_SidType *ret_type)
+{
+       struct lsa_dom_info *domain;
+       struct lsa_name_info *name;
+       TALLOC_CTX *tmp_ctx;
+       bool ret = false;
+
+       DEBUG(10, ("lookup_sid called for SID '%s'\n", sid_string_dbg(sid)));
+
+       if (!(tmp_ctx = talloc_new(mem_ctx))) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return false;
+       }
+
+       if (!NT_STATUS_IS_OK(lookup_sids(tmp_ctx, 1, &sid, 1,
+                                        &domain, &name))) {
+               goto done;
+       }
+
+       if (name->type == SID_NAME_UNKNOWN) {
+               goto done;
+       }
+
+       if ((ret_domain != NULL) &&
+           !(*ret_domain = talloc_strdup(mem_ctx, domain->name))) {
+               goto done;
+       }
+
+       if ((ret_name != NULL) && 
+           !(*ret_name = talloc_strdup(mem_ctx, name->name))) {
+               goto done;
        }
 
        if (ret_type != NULL) {
-               *ret_type = type;
+               *ret_type = name->type;
        }
 
-       talloc_free(tmp_ctx);
-       return True;
+       ret = true;
+
+ done:
+       if (ret) {
+               DEBUG(10, ("Sid %s -> %s\\%s(%d)\n", sid_string_dbg(sid),
+                          domain->name, name->name, name->type));
+       } else {
+               DEBUG(10, ("failed to lookup sid %s\n", sid_string_dbg(sid)));
+       }
+       TALLOC_FREE(tmp_ctx);
+       return ret;
 }
 
 /*****************************************************************
@@ -382,370 +998,518 @@ BOOL lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
  modified to use linked lists by jra.
 *****************************************************************/  
 
-#define MAX_UID_SID_CACHE_SIZE 100
-#define TURNOVER_UID_SID_CACHE_SIZE 10
-#define MAX_GID_SID_CACHE_SIZE 100
-#define TURNOVER_GID_SID_CACHE_SIZE 10
+/*****************************************************************
+  Find a SID given a uid.
+*****************************************************************/
 
-static size_t n_uid_sid_cache = 0;
-static size_t n_gid_sid_cache = 0;
+static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
+{
+       DATA_BLOB cache_value;
 
-static struct uid_sid_cache {
-       struct uid_sid_cache *next, *prev;
-       uid_t uid;
-       DOM_SID sid;
-       enum SID_NAME_USE sidtype;
-} *uid_sid_cache_head;
+       if (!memcache_lookup(NULL, UID_SID_CACHE,
+                            data_blob_const(&uid, sizeof(uid)),
+                            &cache_value)) {
+               return false;
+       }
 
-static struct gid_sid_cache {
-       struct gid_sid_cache *next, *prev;
-       gid_t gid;
-       DOM_SID sid;
-       enum SID_NAME_USE sidtype;
-} *gid_sid_cache_head;
+       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 SID given a uid.
-*****************************************************************/  
+  Find a uid given a SID.
+*****************************************************************/
 
-static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
+static bool fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
 {
-       struct uid_sid_cache *pc;
+       DATA_BLOB cache_value;
 
-       for (pc = uid_sid_cache_head; pc; pc = pc->next) {
-               if (pc->uid == uid) {
-                       *psid = pc->sid;
-                       DEBUG(3,("fetch sid from uid cache %u -> %s\n",
-                                (unsigned int)uid, sid_string_static(psid)));
-                       DLIST_PROMOTE(uid_sid_cache_head, pc);
-                       return True;
-               }
+       if (!memcache_lookup(NULL, SID_UID_CACHE,
+                            data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
+                            &cache_value)) {
+               return false;
        }
-       return False;
+
+       SMB_ASSERT(cache_value.length == sizeof(*puid));
+       memcpy(puid, cache_value.data, sizeof(*puid));
+
+       return true;
 }
 
 /*****************************************************************
 Find a uid given a SID.
-*****************************************************************/  
Store uid to SID mapping in cache.
+*****************************************************************/
 
-static BOOL fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
+void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
 {
-       struct uid_sid_cache *pc;
+       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)));
+}
 
-       for (pc = uid_sid_cache_head; pc; pc = pc->next) {
-               if (sid_compare(&pc->sid, psid) == 0) {
-                       *puid = pc->uid;
-                       DEBUG(3,("fetch uid from cache %u -> %s\n",
-                                (unsigned int)*puid, sid_string_static(psid)));
-                       DLIST_PROMOTE(uid_sid_cache_head, pc);
-                       return True;
-               }
+/*****************************************************************
+  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;
        }
-       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;
 }
 
 /*****************************************************************
- Store uid to SID mapping in cache.
+  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 store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
+static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
 {
-       struct uid_sid_cache *pc;
+       uint32 rid;
+       bool ret;
+
+       ZERO_STRUCTP(psid);
 
-       if (n_uid_sid_cache >= MAX_UID_SID_CACHE_SIZE && n_uid_sid_cache > TURNOVER_UID_SID_CACHE_SIZE) {
-               /* Delete the last TURNOVER_UID_SID_CACHE_SIZE entries. */
-               struct uid_sid_cache *pc_next;
-               size_t i;
+       become_root();
+       ret = pdb_uid_to_rid(uid, &rid);
+       unbecome_root();
 
-               for (i = 0, pc = uid_sid_cache_head; i < (n_uid_sid_cache - TURNOVER_UID_SID_CACHE_SIZE); i++, pc = pc->next)
-                       ;
-               for(; pc; pc = pc_next) {
-                       pc_next = pc->next;
-                       DLIST_REMOVE(uid_sid_cache_head,pc);
-                       SAFE_FREE(pc);
-                       n_uid_sid_cache--;
-               }
+       if (ret) {
+               /* This is a mapped user */
+               sid_copy(psid, get_global_sam_sid());
+               sid_append_rid(psid, rid);
+               goto done;
        }
 
-       pc = SMB_MALLOC_P(struct uid_sid_cache);
-       if (!pc)
-               return;
-       pc->uid = uid;
-       sid_copy(&pc->sid, psid);
-       DLIST_ADD(uid_sid_cache_head, pc);
-       n_uid_sid_cache++;
+       /* This is an unmapped user */
+
+       uid_to_unix_users_sid(uid, psid);
+
+ done:
+       DEBUG(10,("LEGACY: uid %u -> sid %s\n", (unsigned int)uid,
+                 sid_string_dbg(psid)));
+
+       store_uid_sid_cache(psid, uid);
+       return;
 }
 
 /*****************************************************************
 Find a SID given a gid.
*THE LEGACY* convert gid_t to SID function.
 *****************************************************************/  
 
-static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
+static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
 {
-       struct gid_sid_cache *pc;
+       bool ret;
 
-       for (pc = gid_sid_cache_head; pc; pc = pc->next) {
-               if (pc->gid == gid) {
-                       *psid = pc->sid;
-                       DEBUG(3,("fetch sid from gid cache %u -> %s\n",
-                                (unsigned int)gid, sid_string_static(psid)));
-                       DLIST_PROMOTE(gid_sid_cache_head, pc);
-                       return True;
-               }
+       ZERO_STRUCTP(psid);
+
+       become_root();
+       ret = pdb_gid_to_sid(gid, psid);
+       unbecome_root();
+
+       if (ret) {
+               /* This is a mapped group */
+               goto done;
        }
-       return False;
+       
+       /* This is an unmapped group */
+
+       gid_to_unix_groups_sid(gid, psid);
+
+ done:
+       DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
+                 sid_string_dbg(psid)));
+
+       store_gid_sid_cache(psid, gid);
+       return;
 }
 
 /*****************************************************************
 Find a gid given a SID.
*THE LEGACY* convert SID to uid function.
 *****************************************************************/  
 
-static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
+static bool legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
 {
-       struct gid_sid_cache *pc;
+       enum lsa_SidType type;
+       uint32 rid;
 
-       for (pc = gid_sid_cache_head; pc; pc = pc->next) {
-               if (sid_compare(&pc->sid, psid) == 0) {
-                       *pgid = pc->gid;
-                       DEBUG(3,("fetch gid from cache %u -> %s\n",
-                                (unsigned int)*pgid, sid_string_static(psid)));
-                       DLIST_PROMOTE(gid_sid_cache_head, pc);
-                       return True;
+       if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
+               union unid_t id;
+               bool ret;
+
+               become_root();
+               ret = pdb_sid_to_id(psid, &id, &type);
+               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 */
        }
-       return False;
+
+       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;
 }
 
 /*****************************************************************
- Store gid to SID mapping in cache.
+ *THE LEGACY* convert SID to gid function.
+ Group mapping is used for gids that maps to Wellknown SIDs
 *****************************************************************/  
 
-static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
+static bool legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
-       struct gid_sid_cache *pc;
+       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;
 
-       if (n_gid_sid_cache >= MAX_GID_SID_CACHE_SIZE && n_gid_sid_cache > TURNOVER_GID_SID_CACHE_SIZE) {
-               /* Delete the last TURNOVER_GID_SID_CACHE_SIZE entries. */
-               struct gid_sid_cache *pc_next;
-               size_t i;
+               become_root();
+               ret = pdb_getgrsid(&map, *psid);
+               unbecome_root();
 
-               for (i = 0, pc = gid_sid_cache_head; i < (n_gid_sid_cache - TURNOVER_GID_SID_CACHE_SIZE); i++, pc = pc->next)
-                       ;
-               for(; pc; pc = pc_next) {
-                       pc_next = pc->next;
-                       DLIST_REMOVE(gid_sid_cache_head,pc);
-                       SAFE_FREE(pc);
-                       n_gid_sid_cache--;
+               if (ret) {
+                       *pgid = map.gid;
+                       goto done;
                }
+               DEBUG(10,("LEGACY: mapping failed for sid %s\n",
+                         sid_string_dbg(psid)));
+               return false;
        }
 
-       pc = SMB_MALLOC_P(struct gid_sid_cache);
-       if (!pc)
-               return;
-       pc->gid = gid;
-       sid_copy(&pc->sid, psid);
-       DLIST_ADD(gid_sid_cache_head, pc);
-       n_gid_sid_cache++;
+       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);
+
+       return true;
 }
 
 /*****************************************************************
  *THE CANONICAL* convert uid_t to SID function.
 *****************************************************************/  
 
-NTSTATUS uid_to_sid(DOM_SID *psid, uid_t uid)
+void uid_to_sid(DOM_SID *psid, uid_t uid)
 {
-       uid_t low, high;
-
+       bool expired = true;
+       bool ret;
        ZERO_STRUCTP(psid);
 
        if (fetch_sid_from_uid_cache(psid, uid))
-               return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
-
-       /* DC's never use winbindd to resolve users outside the 
-          defined idmap range */
+               return;
 
-       if ( lp_server_role()==ROLE_DOMAIN_MEMBER 
-               || (lp_idmap_uid(&low, &high) && uid >= low && uid <= high) ) 
-       {
-               if (winbind_uid_to_sid(psid, uid)) {
+       /* Check the winbindd cache directly. */
+       ret = idmap_cache_find_uid2sid(uid, psid, &expired);
 
-                       DEBUG(10,("uid_to_sid: winbindd %u -> %s\n",
-                                 (unsigned int)uid, sid_string_static(psid)));
+       if (ret && !expired && is_null_sid(psid)) {
+               /*
+                * Negative cache entry, we already asked.
+                * do legacy.
+                */
+               legacy_uid_to_sid(psid, uid);
+               return;
+       }
 
-                       if (psid)
-                               store_uid_sid_cache(psid, uid);
-                       return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+       if (!ret || expired) {
+               /* Not in cache. Ask winbindd. */
+               if (!winbind_uid_to_sid(psid, uid)) {
+                       /*
+                        * We shouldn't return the NULL SID
+                        * here if winbind was running and
+                        * couldn't map, as winbind will have
+                        * added a negative entry that will
+                        * cause us to go though the
+                        * legacy_uid_to_sid()
+                        * function anyway in the case above
+                        * the next time we ask.
+                        */
+                       DEBUG(5, ("uid_to_sid: winbind failed to find a sid "
+                                 "for uid %u\n", (unsigned int)uid));
+
+                       legacy_uid_to_sid(psid, uid);
+                       return;
                }
        }
 
-       if (!local_uid_to_sid(psid, uid)) {
-               DEBUG(10,("uid_to_sid: local %u failed to map to sid\n", (unsigned int)uid ));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-        
-       DEBUG(10,("uid_to_sid: local %u -> %s\n", (unsigned int)uid,
-                 sid_string_static(psid)));
+       DEBUG(10,("uid %u -> sid %s\n", (unsigned int)uid,
+                 sid_string_dbg(psid)));
 
        store_uid_sid_cache(psid, uid);
-       return NT_STATUS_OK;
+       return;
 }
 
 /*****************************************************************
  *THE CANONICAL* convert gid_t to SID function.
 *****************************************************************/  
 
-NTSTATUS gid_to_sid(DOM_SID *psid, gid_t gid)
+void gid_to_sid(DOM_SID *psid, gid_t gid)
 {
-       gid_t low, high;
-
+       bool expired = true;
+       bool ret;
        ZERO_STRUCTP(psid);
 
        if (fetch_sid_from_gid_cache(psid, gid))
-               return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+               return;
 
-       /* DC's never use winbindd to resolve groups outside the
-          defined idmap range */
+       /* Check the winbindd cache directly. */
+       ret = idmap_cache_find_gid2sid(gid, psid, &expired);
 
-       if ( lp_server_role()==ROLE_DOMAIN_MEMBER
-               || (lp_idmap_gid(&low, &high) && gid >= low && gid <= high) )
-        {
-               if (winbind_gid_to_sid(psid, gid)) {
+       if (ret && !expired && is_null_sid(psid)) {
+               /*
+                * Negative cache entry, we already asked.
+                * do legacy.
+                */
+               legacy_gid_to_sid(psid, gid);
+               return;
+       }
 
-                       DEBUG(10,("gid_to_sid: winbindd %u -> %s\n",
-                                 (unsigned int)gid, sid_string_static(psid)));
-                        
-                       if (psid)
-                               store_gid_sid_cache(psid, gid);
-                       return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+       if (!ret || expired) {
+               /* Not in cache. Ask winbindd. */
+               if (!winbind_gid_to_sid(psid, gid)) {
+                       /*
+                        * We shouldn't return the NULL SID
+                        * here if winbind was running and
+                        * couldn't map, as winbind will have
+                        * added a negative entry that will
+                        * cause us to go though the
+                        * legacy_gid_to_sid()
+                        * function anyway in the case above
+                        * the next time we ask.
+                        */
+                       DEBUG(5, ("gid_to_sid: winbind failed to find a sid "
+                                 "for gid %u\n", (unsigned int)gid));
+
+                       legacy_gid_to_sid(psid, gid);
+                       return;
                }
        }
 
-       if (!local_gid_to_sid(psid, gid)) {
-               DEBUG(10,("gid_to_sid: local %u failed to map to sid\n", (unsigned int)gid ));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-        
-       DEBUG(10,("gid_to_sid: local %u -> %s\n", (unsigned int)gid,
-                 sid_string_static(psid)));
+       DEBUG(10,("gid %u -> sid %s\n", (unsigned int)gid,
+                 sid_string_dbg(psid)));
 
        store_gid_sid_cache(psid, gid);
-       return NT_STATUS_OK;
+       return;
 }
 
 /*****************************************************************
  *THE CANONICAL* convert SID to uid function.
 *****************************************************************/  
 
-NTSTATUS sid_to_uid(const DOM_SID *psid, uid_t *puid)
+bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
 {
-       enum SID_NAME_USE name_type;
+       bool expired = true;
+       bool ret;
+       uint32 rid;
+       gid_t gid;
 
        if (fetch_uid_from_cache(puid, psid))
-               return NT_STATUS_OK;
+               return true;
 
-       /* if this is our SID then go straight to a local lookup */
-       
-       if ( sid_compare_domain(get_global_sam_sid(), psid) == 0 ) {
-               DEBUG(10,("sid_to_uid: my domain (%s) - trying local.\n",
-                       sid_string_static(psid) ));
-               
-               if ( local_sid_to_uid(puid, psid, &name_type) )
-                       goto success;
-                       
-               DEBUG(10,("sid_to_uid: local lookup failed\n"));
-               
-               return NT_STATUS_UNSUCCESSFUL;
+       if (fetch_gid_from_cache(&gid, psid)) {
+               return false;
        }
-       
-       /* If it is not our local domain, only hope is winbindd */
 
-       if ( !winbind_lookup_sid(NULL, psid, NULL, NULL, &name_type) ) {
-               DEBUG(10,("sid_to_uid: winbind lookup for non-local sid %s failed\n",
-                       sid_string_static(psid) ));
-                       
-               return NT_STATUS_UNSUCCESSFUL;
+       /* Optimize for the Unix Users Domain
+        * as the conversion is straightforward */
+       if (sid_peek_check_rid(&global_sid_Unix_Users, psid, &rid)) {
+               uid_t uid = rid;
+               *puid = uid;
+
+               /* return here, don't cache */
+               DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
+                       (unsigned int)*puid ));
+               return true;
        }
 
-       /* If winbindd does know the SID, ensure this is a user */
+       /* Check the winbindd cache directly. */
+       ret = idmap_cache_find_sid2uid(psid, puid, &expired);
 
-       if (name_type != SID_NAME_USER) {
-               DEBUG(10,("sid_to_uid: winbind lookup succeeded but SID is not a user (%u)\n",
-                       (unsigned int)name_type ));
-               return NT_STATUS_INVALID_PARAMETER;
+       if (ret && !expired && (*puid == (uid_t)-1)) {
+               /*
+                * Negative cache entry, we already asked.
+                * do legacy.
+                */
+               return legacy_sid_to_uid(psid, puid);
        }
 
-       /* get the uid.  Has to work or else we are dead in the water */
+       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);
+                       }
 
-       if ( !winbind_sid_to_uid(puid, psid) ) {
-               DEBUG(10,("sid_to_uid: winbind failed to allocate a new uid for sid %s\n",
-                         sid_string_static(psid)));
-               return NT_STATUS_UNSUCCESSFUL;
+                       DEBUG(5, ("winbind failed to find a uid for sid %s\n",
+                                 sid_string_dbg(psid)));
+                       return false;
+               }
        }
 
-success:
-       DEBUG(10,("sid_to_uid: %s -> %u\n", sid_string_static(psid),
+       /* TODO: Here would be the place to allocate both a gid and a uid for
+        * the SID in question */
+
+       DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
                (unsigned int)*puid ));
 
        store_uid_sid_cache(psid, *puid);
-       
-       return NT_STATUS_OK;
+       return true;
 }
+
 /*****************************************************************
  *THE CANONICAL* convert SID to gid function.
  Group mapping is used for gids that maps to Wellknown SIDs
 *****************************************************************/  
 
-NTSTATUS sid_to_gid(const DOM_SID *psid, gid_t *pgid)
+bool sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
-       enum SID_NAME_USE name_type;
+       bool expired = true;
+       bool ret;
+       uint32 rid;
+       uid_t uid;
 
        if (fetch_gid_from_cache(pgid, psid))
-               return NT_STATUS_OK;
+               return true;
 
-       /*
-        * First we must look up the name and decide if this is a group sid.
-        * Group mapping can deal with foreign SIDs
-        */
+       if (fetch_uid_from_cache(&uid, psid))
+               return false;
 
-       if ( local_sid_to_gid(pgid, psid, &name_type) )
-               goto success;
-       
-       if (!winbind_lookup_sid(NULL, psid, NULL, NULL, &name_type)) {
-               DEBUG(10,("sid_to_gid: no one knows the SID %s (tried local, then "
-                         "winbind)\n", sid_string_static(psid)));
-               
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       /* Optimize for the Unix Groups Domain
+        * as the conversion is straightforward */
+       if (sid_peek_check_rid(&global_sid_Unix_Groups, psid, &rid)) {
+               gid_t gid = rid;
+               *pgid = gid;
 
-       /* winbindd knows it; Ensure this is a group sid */
+               /* return here, don't cache */
+               DEBUG(10,("sid %s -> gid %u\n", sid_string_dbg(psid),
+                       (unsigned int)*pgid ));
+               return true;
+       }
 
-       if ((name_type != SID_NAME_DOM_GRP) && (name_type != SID_NAME_ALIAS) 
-               && (name_type != SID_NAME_WKN_GRP)) 
-       {
-               DEBUG(10,("sid_to_gid: winbind lookup succeeded but SID is not a known group (%u)\n",
-                       (unsigned int)name_type ));
+       /* Check the winbindd cache directly. */
+       ret = idmap_cache_find_sid2gid(psid, pgid, &expired);
 
-               /* winbindd is running and knows about this SID.  Just the wrong type.
-                  Don't fallback to a local lookup here */
-                  
-               return NT_STATUS_INVALID_PARAMETER;
+       if (ret && !expired && (*pgid == (gid_t)-1)) {
+               /*
+                * Negative cache entry, we already asked.
+                * do legacy.
+                */
+               return legacy_sid_to_gid(psid, pgid);
        }
-       
-       /* winbindd knows it and it is a type of group; sid_to_gid must succeed
-          or we are dead in the water */
 
-       if ( !winbind_sid_to_gid(pgid, psid) ) {
-               DEBUG(10,("sid_to_gid: winbind failed to allocate a new gid for sid %s\n",
-                         sid_string_static(psid)));
-               return NT_STATUS_UNSUCCESSFUL;
+       if (!ret || expired) {
+               /* Not in cache or negative. Ask winbindd. */
+               /* Ask winbindd if it can map this sid to a gid.
+                * (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;
+               }
        }
 
-success:
-       DEBUG(10,("sid_to_gid: %s -> %u\n", sid_string_static(psid),
+       DEBUG(10,("sid %s -> gid %u\n", sid_string_dbg(psid),
                  (unsigned int)*pgid ));
 
        store_gid_sid_cache(psid, *pgid);
-       
-       return NT_STATUS_OK;
+       return true;
 }
-