r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text
[samba.git] / source3 / passdb / lookup_sid.c
index 425c9b87f10d2a9ef435961c2c62a6828de4e2c5..313a8c0a8b1600ef60f2e9f3fba2f27c5da24a79 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,
    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"
 
 /*****************************************************************
- *THE CANONICAL* convert name to SID function.
- Tries local lookup first - for local domains - then uses winbind.
+ Dissect a user-provided name into domain, name, sid and type.
+
+ If an explicit domain name was given in the form domain\user, it
+ has to try that. If no explicit domain name was given, we have
+ to do guesswork.
 *****************************************************************/  
 
-BOOL lookup_name(const char *domain, const char *name, DOM_SID *psid, enum SID_NAME_USE *name_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)
 {
-       fstring sid;
-       BOOL local_lookup = False;
-       
-       *name_type = SID_NAME_UNKNOWN;
+       char *p;
+       const char *tmp;
+       const char *domain = NULL;
+       const char *name = NULL;
+       uint32 rid;
+       DOM_SID sid;
+       enum lsa_SidType type;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
-       /* If we are looking up a domain user, make sure it is
-          for the local machine only */
-       
-       if (strequal(global_myname(), domain)) {
-               local_lookup = True;
-       } else if (lp_server_role() == ROLE_DOMAIN_PDC || 
-                  lp_server_role() == ROLE_DOMAIN_BDC) {
-               if (strequal(domain, lp_workgroup())) {
-                       local_lookup = True;
+       if (tmp_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return False;
+       }
+
+       p = strchr_m(full_name, '\\');
+
+       if (p != NULL) {
+               domain = talloc_strndup(tmp_ctx, full_name,
+                                       PTR_DIFF(p, full_name));
+               name = talloc_strdup(tmp_ctx, p+1);
+       } else {
+               domain = talloc_strdup(tmp_ctx, "");
+               name = talloc_strdup(tmp_ctx, full_name);
+       }
+
+       DEBUG(10,("lookup_name: %s => %s (domain), %s (name)\n", 
+               full_name, domain, name));
+
+       if ((domain == NULL) || (name == NULL)) {
+               DEBUG(0, ("talloc failed\n"));
+               TALLOC_FREE(tmp_ctx);
+               return False;
+       }
+
+       if (strequal(domain, get_global_sam_name())) {
+
+               /* 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);
+                       goto ok;
+               }
+               TALLOC_FREE(tmp_ctx);
+               return False;
+       }
+
+       if (strequal(domain, builtin_domain_name())) {
+
+               /* Explicit request for a name in BUILTIN */
+               if (lookup_builtin_name(name, &rid)) {
+                       sid_copy(&sid, &global_sid_Builtin);
+                       sid_append_rid(&sid, rid);
+                       type = SID_NAME_ALIAS;
+                       goto ok;
+               }
+               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') &&
+           (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 (!(flags & LOOKUP_NAME_EXPLICIT) && strequal(domain, unix_groups_domain_name())) {
+               if (lookup_unix_group_name(name, &sid)) {
+                       type = SID_NAME_DOM_GRP;
+                       goto ok;
+               }
+               TALLOC_FREE(tmp_ctx);
+               return False;
+       }
+
+       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
+        * domain. Try the sequence as documented on
+        * http://msdn.microsoft.com/library/en-us/secmgmt/security/lsalookupnames.asp
+        * November 27, 2005 */
+
+       /* 1. well-known names */
+
+       if (lookup_wellknown_name(tmp_ctx, name, &sid, &domain)) {
+               type = SID_NAME_WKN_GRP;
+               goto ok;
+       }
+
+       /* 2. Builtin domain as such */
+
+       if (strequal(name, builtin_domain_name())) {
+               /* Swap domain and name */
+               tmp = name; name = domain; domain = tmp;
+               sid_copy(&sid, &global_sid_Builtin);
+               type = SID_NAME_DOMAIN;
+               goto ok;
+       }
+
+       /* 3. Account domain */
+
+       if (strequal(name, get_global_sam_name())) {
+               if (!secrets_fetch_domain_sid(name, &sid)) {
+                       DEBUG(3, ("Could not fetch my SID\n"));
+                       TALLOC_FREE(tmp_ctx);
+                       return False;
+               }
+               /* Swap domain and name */
+               tmp = name; name = domain; domain = tmp;
+               type = SID_NAME_DOMAIN;
+               goto ok;
+       }
+
+       /* 4. Primary domain */
+
+       if (!IS_DC && strequal(name, lp_workgroup())) {
+               if (!secrets_fetch_domain_sid(name, &sid)) {
+                       DEBUG(3, ("Could not fetch the domain SID\n"));
+                       TALLOC_FREE(tmp_ctx);
+                       return False;
+               }
+               /* Swap domain and name */
+               tmp = name; name = domain; domain = tmp;
+               type = SID_NAME_DOMAIN;
+               goto ok;
+       }
+
+       /* 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 && (pdb_get_trusteddom_pw(name, NULL, &sid, NULL))) {
+               /* Swap domain and name */
+               tmp = name; name = domain; domain = tmp;
+               type = SID_NAME_DOMAIN;
+               goto ok;
+       }
+
+       /* 6. Builtin aliases */        
+
+       if (lookup_builtin_name(name, &rid)) {
+               domain = talloc_strdup(tmp_ctx, builtin_domain_name());
+               sid_copy(&sid, &global_sid_Builtin);
+               sid_append_rid(&sid, rid);
+               type = SID_NAME_ALIAS;
+               goto ok;
+       }
+
+       /* 7. Local systems' SAM (DCs don't have a local SAM) */
+       /* 8. Primary SAM (On members, this is the domain) */
+
+       /* Both cases are done by looking at our passdb */
+
+       if (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);
+               goto ok;
+       }
+
+       /* Now our local possibilities are exhausted. */
+
+       if (!(flags & LOOKUP_NAME_REMOTE)) {
+               TALLOC_FREE(tmp_ctx);
+               return False;
+       }
+
+       /* If we are not a DC, we have to ask in our primary domain. Let
+        * winbind do that. */
+
+       if (!IS_DC &&
+           (winbind_lookup_name(lp_workgroup(), name, &sid, &type))) {
+               domain = talloc_strdup(tmp_ctx, lp_workgroup());
+               goto ok;
+       }
+
+       /* 9. Trusted domains */
+
+       /* If we're a DC we have to ask all trusted DC's. Winbind does not do
+        * that (yet), but give it a chance. */
+
+       if (IS_DC && winbind_lookup_name("", name, &sid, &type)) {
+               DOM_SID dom_sid;
+               uint32 tmp_rid;
+               enum lsa_SidType domain_type;
                
-       if (local_lookup) {
-               if (local_lookup_name(name, psid, name_type)) {
-                       DEBUG(10,
-                             ("lookup_name: (local) [%s]\\[%s] -> SID %s (type %s: %u)\n",
-                              domain, name, sid_to_string(sid,psid),
-                              sid_type_lookup(*name_type), (unsigned int)*name_type));
-                       return True;
+               if (type == SID_NAME_DOMAIN) {
+                       /* Swap name and type */
+                       tmp = name; name = domain; domain = tmp;
+                       goto ok;
                }
-       } else {
-               /* Remote */
-               if (winbind_lookup_name(domain, name, psid, name_type)) {
-                       
-                       DEBUG(10,("lookup_name (winbindd): [%s]\\[%s] -> SID %s (type %u)\n",
-                                 domain, name, sid_to_string(sid, psid), 
-                                 (unsigned int)*name_type));
-                       return True;
+
+               /* Here we have to cope with a little deficiency in the
+                * winbind API: We have to ask it again for the name of the
+                * domain it figured out itself. Maybe fix that later... */
+
+               sid_copy(&dom_sid, &sid);
+               sid_split_rid(&dom_sid, &tmp_rid);
+
+               if (!winbind_lookup_sid(tmp_ctx, &dom_sid, &domain, NULL,
+                                       &domain_type) ||
+                   (domain_type != SID_NAME_DOMAIN)) {
+                       DEBUG(2, ("winbind could not find the domain's name "
+                                 "it just looked up for us\n"));
+                       TALLOC_FREE(tmp_ctx);
+                       return False;
                }
+               goto ok;
        }
-       
-       DEBUG(10, ("lookup_name: %s lookup for [%s]\\[%s] failed\n", 
-                  local_lookup ? "local" : "winbind", domain, name));
 
+       /* 10. Don't translate */
+
+       /* 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;
+       }
+
+       /*
+        * 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;
+               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 = tmp_dom;
+       }
+
+       if (ret_sid != NULL) {
+               sid_copy(ret_sid, &sid);
+       }
+
+       if (ret_type != NULL) {
+               *ret_type = type;
+       }
+
+       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(DOM_SID *sid, fstring dom_name, fstring name, enum SID_NAME_USE *name_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)
 {
-       if (!name_type)
+       char *qualified_name;
+       const char *p;
+
+       /* NB. No winbindd_separator here as lookup_name needs \\' */
+       if ((p = strchr_m(full_name, *lp_winbind_separator())) != NULL) {
+
+               /* 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);
+       }
+
+       /* 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;
+       }
 
-       *name_type = SID_NAME_UNKNOWN;
+       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;
+       }
 
-       /* Check if this is our own sid.  This should perhaps be done by
-          winbind?  For the moment handle it here. */
+       return lookup_name(mem_ctx, qualified_name, flags,
+                               ret_domain, ret_name,
+                               ret_sid, ret_type);
+}
 
-       if (sid->num_auths == 5) {
-               DOM_SID tmp_sid;
-               uint32 rid;
+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;
+       }
+
+       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;
+
+       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;
 
-               sid_copy(&tmp_sid, sid);
-               sid_split_rid(&tmp_sid, &rid);
+               if (*domain_name == NULL) {
+                       *domain_name = talloc_strdup(
+                               mem_ctx, get_global_sam_name());
+               }
+
+               if (*domain_name == NULL) {
+                       return False;
+               }
 
-               if (sid_equal(get_global_sam_sid(), &tmp_sid)) {
+               become_root();
+               result = pdb_lookup_rids(domain_sid, num_rids, rids,
+                                        *names, *types);
+               unbecome_root();
 
-                       return map_domain_sid_to_name(&tmp_sid, dom_name) &&
-                               local_lookup_sid(sid, name, name_type);
+               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());
+               }
+               for (i=0; i<num_rids; i++) {
+                       (*names)[i] = talloc_strdup(
+                               (*names), uidtoname(rids[i]));
+                       (*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());
+               }
+               for (i=0; i<num_rids; i++) {
+                       (*names)[i] = talloc_strdup(
+                               (*names), gidtoname(rids[i]));
+                       (*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;
+       }
+
+       if (sid_check_is_wellknown_domain(sid, &tmp)) {
+               *name = talloc_strdup(mem_ctx, tmp);
+               return True;
+       }
+
+       if (sid->num_auths != 4) {
+               /* This can't be a domain */
+               return False;
+       }
+
+       if (IS_DC) {
+               uint32 i, num_domains;
+               struct trustdom_info **domains;
+
+               /* 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;
+               }
+
+               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;
+       }
+
+       if (winbind_lookup_sid(mem_ctx, sid, &tmp, NULL, &type) &&
+           (type == SID_NAME_DOMAIN)) {
+               *name = tmp;
+               return True;
        }
 
-       if (!winbind_lookup_sid(sid, dom_name, name, name_type)) {
-               fstring sid_str;
-               DOM_SID tmp_sid;
+       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, ("%s SID %s in level %d\n",
+                  ret ? "Accepting" : "Rejecting",
+                  sid_string_static(sid), level));
+       return ret;
+}
+
+/*
+ * 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;
+       }
+
+       dom_infos = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_dom_info,
+                                     MAX_REF_DOMAINS);
+       if (dom_infos == NULL) {
+               result = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
+
+       /* 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
+        */
+
+       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_PARAMETER;
+                               goto fail;
+                       }
+               }
 
-               DEBUG(10,("lookup_sid: winbind lookup for SID %s failed - trying local.\n", sid_to_string(sid_str, sid) ));
+               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<MAX_REF_DOMAINS; j++) {
+                       if (!dom_infos[j].valid) {
+                               break;
+                       }
+                       if (sid_equal(&sid, &dom_infos[j].sid)) {
+                               break;
+                       }
+               }
 
-               sid_copy(&tmp_sid, sid);
-               sid_split_rid(&tmp_sid, &rid);
-               return map_domain_sid_to_name(&tmp_sid, dom_name) &&
-                       lookup_known_rid(&tmp_sid, rid, name, name_type);
+               if (j == MAX_REF_DOMAINS) {
+                       /* 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;
+                       }
+               }
        }
-       return True;
+
+       /* Iterate over the domains found */
+
+       for (i=0; i<MAX_REF_DOMAINS; 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;
+                       }
+               }
+       }
+
+       *ret_domains = dom_infos;
+       *ret_names = name_infos;
+       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;
+
+       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 = name->type;
+       }
+
+       ret = True;
+
+ done:
+       if (ret) {
+               DEBUG(10, ("Sid %s -> %s\\%s(%d)\n",
+                          sid_string_static(sid), domain->name,
+                          name->name, name->type));
+       } else {
+               DEBUG(10, ("failed to lookup sid %s\n",
+                          sid_string_static(sid)));
+       }
+       TALLOC_FREE(tmp_ctx);
+       return ret;
+}
 
 /*****************************************************************
  Id mapping cache.  This is to avoid Winbind mappings already
@@ -135,14 +965,14 @@ static struct uid_sid_cache {
        struct uid_sid_cache *next, *prev;
        uid_t uid;
        DOM_SID sid;
-       enum SID_NAME_USE sidtype;
+       enum lsa_SidType sidtype;
 } *uid_sid_cache_head;
 
 static struct gid_sid_cache {
        struct gid_sid_cache *next, *prev;
        gid_t gid;
        DOM_SID sid;
-       enum SID_NAME_USE sidtype;
+       enum lsa_SidType sidtype;
 } *gid_sid_cache_head;
 
 /*****************************************************************
@@ -155,10 +985,9 @@ static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
 
        for (pc = uid_sid_cache_head; pc; pc = pc->next) {
                if (pc->uid == uid) {
-                       fstring sid;
                        *psid = pc->sid;
                        DEBUG(3,("fetch sid from uid cache %u -> %s\n",
-                               (unsigned int)uid, sid_to_string(sid, psid)));
+                                (unsigned int)uid, sid_string_static(psid)));
                        DLIST_PROMOTE(uid_sid_cache_head, pc);
                        return True;
                }
@@ -176,10 +1005,9 @@ static BOOL fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
 
        for (pc = uid_sid_cache_head; pc; pc = pc->next) {
                if (sid_compare(&pc->sid, psid) == 0) {
-                       fstring sid;
                        *puid = pc->uid;
                        DEBUG(3,("fetch uid from cache %u -> %s\n",
-                               (unsigned int)*puid, sid_to_string(sid, psid)));
+                                (unsigned int)*puid, sid_string_static(psid)));
                        DLIST_PROMOTE(uid_sid_cache_head, pc);
                        return True;
                }
@@ -191,10 +1019,15 @@ static BOOL fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
  Store uid to SID mapping in cache.
 *****************************************************************/  
 
-static void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
+void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
 {
        struct uid_sid_cache *pc;
 
+       /* do not store SIDs in the "Unix Group" domain */
+       
+       if ( sid_check_is_in_unix_users( psid ) )
+               return;
+
        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;
@@ -210,7 +1043,7 @@ static void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
                }
        }
 
-       pc = (struct uid_sid_cache *)malloc(sizeof(struct uid_sid_cache));
+       pc = SMB_MALLOC_P(struct uid_sid_cache);
        if (!pc)
                return;
        pc->uid = uid;
@@ -229,10 +1062,9 @@ static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
 
        for (pc = gid_sid_cache_head; pc; pc = pc->next) {
                if (pc->gid == gid) {
-                       fstring sid;
                        *psid = pc->sid;
                        DEBUG(3,("fetch sid from gid cache %u -> %s\n",
-                               (unsigned int)gid, sid_to_string(sid, psid)));
+                                (unsigned int)gid, sid_string_static(psid)));
                        DLIST_PROMOTE(gid_sid_cache_head, pc);
                        return True;
                }
@@ -250,10 +1082,9 @@ static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
 
        for (pc = gid_sid_cache_head; pc; pc = pc->next) {
                if (sid_compare(&pc->sid, psid) == 0) {
-                       fstring sid;
                        *pgid = pc->gid;
-                       DEBUG(3,("fetch uid from cache %u -> %s\n",
-                               (unsigned int)*pgid, sid_to_string(sid, psid)));
+                       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;
                }
@@ -265,9 +1096,14 @@ static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
  Store gid to SID mapping in cache.
 *****************************************************************/  
 
-static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
+void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
 {
        struct gid_sid_cache *pc;
+       
+       /* do not store SIDs in the "Unix Group" domain */
+       
+       if ( sid_check_is_in_unix_groups( psid ) )
+               return;
 
        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. */
@@ -284,217 +1120,340 @@ static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
                }
        }
 
-       pc = (struct gid_sid_cache *)malloc(sizeof(struct gid_sid_cache));
+       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);
+
+       DEBUG(3,("store_gid_sid_cache: gid %u in cache -> %s\n", (unsigned int)gid,
+               sid_string_static(psid)));
+
        n_gid_sid_cache++;
 }
 
 /*****************************************************************
- *THE CANONICAL* convert uid_t to SID function.
+ *THE LEGACY* convert uid_t to SID function.
 *****************************************************************/  
 
-NTSTATUS uid_to_sid(DOM_SID *psid, uid_t uid)
+static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
 {
-       fstring sid;
-       uid_t low, high;
+       uint32 rid;
+       BOOL ret;
 
        ZERO_STRUCTP(psid);
 
-       if (fetch_sid_from_uid_cache(psid, uid))
-               return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+       become_root();
+       ret = pdb_uid_to_rid(uid, &rid);
+       unbecome_root();
+
+       if (ret) {
+               /* This is a mapped user */
+               sid_copy(psid, get_global_sam_sid());
+               sid_append_rid(psid, rid);
+               goto done;
+       }
+
+       /* 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_static(psid)));
+
+       store_uid_sid_cache(psid, uid);
+       return;
+}
+
+/*****************************************************************
+ *THE LEGACY* convert gid_t to SID function.
+*****************************************************************/  
+
+static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
+{
+       BOOL ret;
 
-       /* DC's never use winbindd to resolve users outside the 
-          defined idmap range */
+       ZERO_STRUCTP(psid);
 
-       if ( lp_server_role()==ROLE_DOMAIN_MEMBER 
-               || (lp_idmap_uid(&low, &high) && uid >= low && uid <= high) ) 
-       {
-               if (winbind_uid_to_sid(psid, uid)) {
+       become_root();
+       ret = pdb_gid_to_sid(gid, psid);
+       unbecome_root();
 
-                       DEBUG(10,("uid_to_sid: winbindd %u -> %s\n",
-                               (unsigned int)uid, sid_to_string(sid, psid)));
+       if (ret) {
+               /* This is a mapped group */
+               goto done;
+       }
+       
+       /* This is an unmapped group */
 
-                       if (psid)
-                               store_uid_sid_cache(psid, uid);
-                       return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+       gid_to_unix_groups_sid(gid, psid);
+
+ done:
+       DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
+                 sid_string_static(psid)));
+
+       store_gid_sid_cache(psid, gid);
+       return;
+}
+
+/*****************************************************************
+ *THE LEGACY* convert SID to uid function.
+*****************************************************************/  
+
+static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
+{
+       enum lsa_SidType type;
+       uint32 rid;
+
+       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_static(psid),
+                                         sid_type_lookup(type)));
+                               return False;
+                       }
+                       *puid = id.uid;
+                       goto done;
                }
+
+               /* This was ours, but it was not mapped.  Fail */
        }
 
-       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,("LEGACY: mapping failed for sid %s\n", sid_string_static(psid)));
+       return False;
+
+done:
+       DEBUG(10,("LEGACY: sid %s -> uid %u\n", sid_string_static(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;
+
+               become_root();
+               ret = pdb_getgrsid(&map, *psid);
+               unbecome_root();
+
+               if (ret) {
+                       *pgid = map.gid;
+                       goto done;
+               }
+               DEBUG(10,("LEGACY: mapping failed for sid %s\n", sid_string_static(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_static(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_static(psid)));
+       return False;
+       
+ done:
+       DEBUG(10,("LEGACY: sid %s -> gid %u\n", sid_string_static(psid),
+                 (unsigned int)*pgid ));
+
+       store_gid_sid_cache(psid, *pgid);
+
+       return True;
+}
+
+/*****************************************************************
+ *THE CANONICAL* convert uid_t to SID function.
+*****************************************************************/  
+
+void uid_to_sid(DOM_SID *psid, uid_t uid)
+{
+       ZERO_STRUCTP(psid);
+
+       if (fetch_sid_from_uid_cache(psid, uid))
+               return;
+
+       if (!winbind_uid_to_sid(psid, uid)) {
+               if (!winbind_ping()) {
+                       legacy_uid_to_sid(psid, uid);
+                       return;
+               }
+
+               DEBUG(5, ("uid_to_sid: winbind failed to find a sid for uid %u\n",
+                       uid));
+               return;
        }
-        
-       DEBUG(10,("uid_to_sid: local %u -> %s\n", (unsigned int)uid, sid_to_string(sid, psid)));
+
+       DEBUG(10,("uid %u -> sid %s\n",
+                 (unsigned int)uid, sid_string_static(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)
 {
-       fstring sid;
-       gid_t low, high;
-
        ZERO_STRUCTP(psid);
 
        if (fetch_sid_from_gid_cache(psid, gid))
-               return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
-
-       /* DC's never use winbindd to resolve groups outside the
-          defined idmap range */
-
-       if ( lp_server_role()==ROLE_DOMAIN_MEMBER
-               || (lp_idmap_gid(&low, &high) && gid >= low && gid <= high) )
-        {
-               if (winbind_gid_to_sid(psid, gid)) {
+               return;
 
-                       DEBUG(10,("gid_to_sid: winbindd %u -> %s\n",
-                               (unsigned int)gid, sid_to_string(sid, psid)));
-                        
-                       if (psid)
-                               store_gid_sid_cache(psid, gid);
-                       return ( psid ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL );
+       if (!winbind_gid_to_sid(psid, gid)) {
+               if (!winbind_ping()) {
+                       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(5, ("gid_to_sid: winbind failed to find a sid for gid %u\n",
+                       gid));
+               return;
        }
-        
-       DEBUG(10,("gid_to_sid: local %u -> %s\n", (unsigned int)gid, sid_to_string(sid, psid)));
 
+       DEBUG(10,("gid %u -> sid %s\n",
+                 (unsigned int)gid, sid_string_static(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)
 {
-       fstring dom_name, name, sid_str;
-       enum SID_NAME_USE name_type;
+       uint32 rid;
+       gid_t gid;
 
        if (fetch_uid_from_cache(puid, psid))
-               return NT_STATUS_OK;
-
-       /* 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 it is not our local domain, only hope is winbindd */
+               return True;
 
-       if ( !winbind_lookup_sid(psid, dom_name, name, &name_type) ) {
-               DEBUG(10,("sid_to_uid: winbind lookup for non-local sid %s failed\n",
-                       sid_string_static(psid) ));
-                       
-               return NT_STATUS_UNSUCCESSFUL;
+       if (fetch_gid_from_cache(&gid, psid)) {
+               return False;
        }
 
-       /* If winbindd does know the SID, ensure this is a user */
+       /* 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;
 
-       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;
+               /* return here, don't cache */
+               DEBUG(10,("sid %s -> uid %u\n", sid_string_static(psid),
+                       (unsigned int)*puid ));
+               return True;
        }
 
-       /* get the uid.  Has to work or else we are dead in the water */
+       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_to_string(sid_str, psid) ));
-               return NT_STATUS_UNSUCCESSFUL;
+               DEBUG(5, ("winbind failed to find a uid for sid %s\n",
+                         sid_string_static(psid)));
+               return False;
        }
 
-success:
-       DEBUG(10,("sid_to_uid: %s -> %u\n", sid_to_string(sid_str, 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_static(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)
 {
-       fstring dom_name, name, sid_str;
-       enum SID_NAME_USE name_type;
+       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 (!winbind_lookup_sid(psid, dom_name, name, &name_type)) {
-               DEBUG(10,("sid_to_gid: winbind lookup for sid %s failed - trying local.\n",
-                       sid_to_string(sid_str, psid) ));
+       /* 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;
 
-               if ( local_sid_to_gid(pgid, psid, &name_type) )
-                       goto success;
-                       
-               DEBUG(10,("sid_to_gid: no one knows this SID\n"));
-               
-               return NT_STATUS_UNSUCCESSFUL;
+               /* return here, don't cache */
+               DEBUG(10,("sid %s -> gid %u\n", sid_string_static(psid),
+                       (unsigned int)*pgid ));
+               return True;
        }
 
-       /* winbindd knows it; Ensure this is a group sid */
-
-       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 ));
-
-               /* 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;
-       }
-       
-       /* winbindd knows it and it is a type of group; sid_to_gid must succeed
-          or we are dead in the water */
+       /* 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) ) {
-               DEBUG(10,("sid_to_uid: winbind failed to allocate a new gid for sid %s\n",
-                       sid_to_string(sid_str, psid) ));
-               return NT_STATUS_UNSUCCESSFUL;
+               if (!winbind_ping()) {
+                       return legacy_sid_to_gid(psid, pgid);
+               }
+
+               DEBUG(10,("winbind failed to find a gid for sid %s\n",
+                                       sid_string_static(psid)));
+               return False;
        }
 
-success:
-       DEBUG(10,("sid_to_gid: %s -> %u\n", sid_to_string(sid_str, psid),
-               (unsigned int)*pgid ));
+       DEBUG(10,("sid %s -> gid %u\n", sid_string_static(psid),
+                 (unsigned int)*pgid ));
 
        store_gid_sid_cache(psid, *pgid);
        
-       return NT_STATUS_OK;
+       return True;
 }