Remove direct caller of secrets_fetch_trusted_domain_password().
[samba.git] / source / passdb / lookup_sid.c
index dbc0e75e595c845c074d9e338a5411843f47f1c0..f5b03ffff06bcd74fa7c1bf454f29214c6e8aaf3 100644 (file)
@@ -7,7 +7,7 @@
    
    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,
@@ -16,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"
@@ -30,7 +29,7 @@
  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 lsa_SidType *ret_type)
@@ -46,7 +45,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        if (tmp_ctx == NULL) {
                DEBUG(0, ("talloc_new failed\n"));
-               return False;
+               return false;
        }
 
        p = strchr_m(full_name, '\\');
@@ -60,16 +59,19 @@ BOOL lookup_name(TALLOC_CTX *mem_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;
+               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, flags, &rid, &type)) {
@@ -78,11 +80,12 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                        goto ok;
                }
                TALLOC_FREE(tmp_ctx);
-               return False;
+               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);
@@ -91,38 +94,39 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                        goto ok;
                }
                TALLOC_FREE(tmp_ctx);
-               return False;
+               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 (strequal(domain, unix_users_domain_name())) {
+       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;
+               return false;
        }
 
-       if (strequal(domain, unix_groups_domain_name())) {
+       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;
+               return false;
        }
 
        if ((domain[0] == '\0') && (!(flags & LOOKUP_NAME_ISOLATED))) {
                TALLOC_FREE(tmp_ctx);
-               return False;
+               return false;
        }
 
        /* Now the guesswork begins, we haven't been given an explicit
@@ -132,14 +136,18 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        /* 1. well-known names */
 
-       if (lookup_wellknown_name(tmp_ctx, name, &sid, &domain)) {
+       if ((flags & LOOKUP_NAME_WKN) &&
+           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())) {
+       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);
@@ -149,11 +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"));
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
@@ -163,11 +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"));
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                /* Swap domain and name */
                tmp = name; name = domain; domain = tmp;
@@ -178,7 +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 && (pdb_get_trusteddom_pw(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;
@@ -187,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);
@@ -200,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, flags, &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);
@@ -211,7 +229,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
 
        if (!(flags & LOOKUP_NAME_REMOTE)) {
                TALLOC_FREE(tmp_ctx);
-               return False;
+               return false;
        }
 
        /* If we are not a DC, we have to ask in our primary domain. Let
@@ -252,7 +270,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                        DEBUG(2, ("winbind could not find the domain's name "
                                  "it just looked up for us\n"));
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                goto ok;
        }
@@ -262,13 +280,13 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        /* 11. Ok, windows would end here. Samba has two more options:
                Unmapped users and unmapped groups */
 
-       if (lookup_unix_user_name(name, &sid)) {
+       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 (lookup_unix_group_name(name, &sid)) {
+       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;
@@ -279,13 +297,13 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
         */
 
        TALLOC_FREE(tmp_ctx);
-       return False;
+       return false;
 
  ok:
        if ((domain == NULL) || (name == NULL)) {
                DEBUG(0, ("talloc failed\n"));
                TALLOC_FREE(tmp_ctx);
-               return False;
+               return false;
        }
 
        /*
@@ -296,7 +314,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
            !(*ret_name = talloc_strdup(mem_ctx, name))) {
                DEBUG(0, ("talloc failed\n"));
                TALLOC_FREE(tmp_ctx);
-               return False;
+               return false;
        }
 
        if (ret_domain != NULL) {
@@ -304,7 +322,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
                if (!(tmp_dom = talloc_strdup(mem_ctx, domain))) {
                        DEBUG(0, ("talloc failed\n"));
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                strupper_m(tmp_dom);
                *ret_domain = tmp_dom;
@@ -319,7 +337,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
        }
 
        TALLOC_FREE(tmp_ctx);
-       return True;
+       return true;
 }
 
 /************************************************************************
@@ -328,7 +346,7 @@ BOOL lookup_name(TALLOC_CTX *mem_ctx,
  and then "Unix Users"\foo (or "Unix Groups"\foo).
 ************************************************************************/
 
-BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
+bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                 const char *full_name, int flags,
                 const char **ret_domain, const char **ret_name,
                 DOM_SID *ret_sid, enum lsa_SidType *ret_type)
@@ -348,7 +366,7 @@ BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
 
                        tmp = talloc_strdup(mem_ctx, full_name);
                        if (!tmp) {
-                               return False;
+                               return false;
                        }
                        tmp[p - full_name] = '\\';
                        full_name = tmp;
@@ -364,13 +382,13 @@ BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                                get_global_sam_name(),
                                full_name );
        if (!qualified_name) {
-               return False;
+               return false;
        }
 
        if (lookup_name(mem_ctx, qualified_name, flags,
                                ret_domain, ret_name,
                                ret_sid, ret_type)) {
-               return True;
+               return true;
        }
        
        /* Finally try with "Unix Users" or "Unix Group" */
@@ -380,7 +398,7 @@ BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                                        unix_users_domain_name(),
                                full_name );
        if (!qualified_name) {
-               return False;
+               return false;
        }
 
        return lookup_name(mem_ctx, qualified_name, flags,
@@ -388,7 +406,7 @@ BOOL lookup_name_smbconf(TALLOC_CTX *mem_ctx,
                                ret_sid, ret_type);
 }
 
-static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
+static bool wb_lookup_rids(TALLOC_CTX *mem_ctx,
                           const DOM_SID *domain_sid,
                           int num_rids, uint32 *rids,
                           const char **domain_name,
@@ -400,7 +418,7 @@ static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
        TALLOC_CTX *tmp_ctx;
 
        if (!(tmp_ctx = talloc_init("wb_lookup_rids"))) {
-               return False;
+               return false;
        }
 
        if (!winbind_lookup_rids(tmp_ctx, domain_sid, num_rids, rids,
@@ -411,12 +429,12 @@ static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
                        types[i] = SID_NAME_UNKNOWN;
                }
                TALLOC_FREE(tmp_ctx);
-               return True;
+               return true;
        }
 
        if (!(*domain_name = talloc_strdup(mem_ctx, *domain_name))) {
                TALLOC_FREE(tmp_ctx);
-               return False;
+               return false;
        }
 
        /*
@@ -427,19 +445,19 @@ static BOOL wb_lookup_rids(TALLOC_CTX *mem_ctx,
        for (i=0; i<num_rids; i++) {
                if (my_names[i] == NULL) {
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                if (!(names[i] = talloc_strdup(names, my_names[i]))) {
                        TALLOC_FREE(tmp_ctx);
-                       return False;
+                       return false;
                }
                types[i] = my_types[i];
        }
        TALLOC_FREE(tmp_ctx);
-       return True;
+       return true;
 }
 
-static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
+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)
@@ -451,7 +469,7 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
 
                if ((*names == NULL) || (*types == NULL)) {
-                       return False;
+                       return false;
                }
        } else {
                *names = NULL;
@@ -467,7 +485,7 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                }
 
                if (*domain_name == NULL) {
-                       return False;
+                       return false;
                }
 
                become_root();
@@ -488,21 +506,21 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                }
 
                if (*domain_name == NULL) {
-                       return False;
+                       return false;
                }
 
                for (i=0; i<num_rids; i++) {
                        if (lookup_builtin_rid(*names, rids[i],
                                               &(*names)[i])) {
                                if ((*names)[i] == NULL) {
-                                       return False;
+                                       return false;
                                }
                                (*types)[i] = SID_NAME_ALIAS;
                        } else {
                                (*types)[i] = SID_NAME_UNKNOWN;
                        }
                }
-               return True;
+               return true;
        }
 
        if (sid_check_is_wellknown_domain(domain_sid, NULL)) {
@@ -513,14 +531,14 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                        if (lookup_wellknown_sid(mem_ctx, &sid,
                                                 domain_name, &(*names)[i])) {
                                if ((*names)[i] == NULL) {
-                                       return False;
+                                       return false;
                                }
                                (*types)[i] = SID_NAME_WKN_GRP;
                        } else {
                                (*types)[i] = SID_NAME_UNKNOWN;
                        }
                }
-               return True;
+               return true;
        }
 
        if (sid_check_is_unix_users(domain_sid)) {
@@ -533,7 +551,7 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                                (*names), uidtoname(rids[i]));
                        (*types)[i] = SID_NAME_USER;
                }
-               return True;
+               return true;
        }
 
        if (sid_check_is_unix_groups(domain_sid)) {
@@ -546,7 +564,7 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
                                (*names), gidtoname(rids[i]));
                        (*types)[i] = SID_NAME_DOM_GRP;
                }
-               return True;
+               return true;
        }
 
        return wb_lookup_rids(mem_ctx, domain_sid, num_rids, rids,
@@ -557,7 +575,7 @@ static BOOL lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
  * Is the SID a domain as such? If yes, lookup its name.
  */
 
-static BOOL lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
+static bool lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
                             const char **name)
 {
        const char *tmp;
@@ -565,22 +583,22 @@ static BOOL lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
 
        if (sid_check_is_domain(sid)) {
                *name = talloc_strdup(mem_ctx, get_global_sam_name());
-               return True;
+               return true;
        }
 
        if (sid_check_is_builtin(sid)) {
                *name = talloc_strdup(mem_ctx, builtin_domain_name());
-               return True;
+               return true;
        }
 
        if (sid_check_is_wellknown_domain(sid, &tmp)) {
                *name = talloc_strdup(mem_ctx, tmp);
-               return True;
+               return true;
        }
 
        if (sid->num_auths != 4) {
                /* This can't be a domain */
-               return False;
+               return false;
        }
 
        if (IS_DC) {
@@ -594,26 +612,26 @@ static BOOL lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
                if (!NT_STATUS_IS_OK(pdb_enum_trusteddoms(mem_ctx,
                                                          &num_domains,
                                                          &domains))) {
-                       return False;
+                       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 true;
                        }
                }
-               return False;
+               return false;
        }
 
        if (winbind_lookup_sid(mem_ctx, sid, &tmp, NULL, &type) &&
            (type == SID_NAME_DOMAIN)) {
                *name = tmp;
-               return True;
+               return true;
        }
 
-       return False;
+       return false;
 }
 
 /*
@@ -631,17 +649,17 @@ static BOOL lookup_as_domain(const DOM_SID *sid, TALLOC_CTX *mem_ctx,
  * 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: Don't lookup anything
+ * Level 5: Only ask transitive forest trusts
  * Level 6: Like 4
  */
 
-static BOOL check_dom_sid_to_level(const DOM_SID *sid, int level)
+static bool check_dom_sid_to_level(const DOM_SID *sid, int level)
 {
-       int ret = False;
+       int ret = false;
 
        switch(level) {
        case 1:
-               ret = True;
+               ret = true;
                break;
        case 2:
                ret = (!sid_check_is_builtin(sid) &&
@@ -653,13 +671,13 @@ static BOOL check_dom_sid_to_level(const DOM_SID *sid, int level)
                ret = sid_check_is_domain(sid);
                break;
        case 5:
-               ret = False;
+               ret = false;
                break;
        }
 
        DEBUG(10, ("%s SID %s in level %d\n",
                   ret ? "Accepting" : "Rejecting",
-                  sid_string_static(sid), level));
+                  sid_string_dbg(sid), level));
        return ret;
 }
 
@@ -791,7 +809,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
                if (!dom_infos[j].valid) {
                        /* We found a domain not yet referenced, create a new
                         * ref. */
-                       dom_infos[j].valid = True;
+                       dom_infos[j].valid = true;
                        sid_copy(&dom_infos[j].sid, &sid);
 
                        if (domain_name != NULL) {
@@ -881,6 +899,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
 
        *ret_domains = dom_infos;
        *ret_names = name_infos;
+       TALLOC_FREE(tmp_ctx);
        return NT_STATUS_OK;
 
  fail:
@@ -894,18 +913,18 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids,
  *THE CANONICAL* convert SID to name function.
 *****************************************************************/  
 
-BOOL lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
+bool lookup_sid(TALLOC_CTX *mem_ctx, const 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;
+       bool ret = false;
 
        if (!(tmp_ctx = talloc_new(mem_ctx))) {
                DEBUG(0, ("talloc_new failed\n"));
-               return False;
+               return false;
        }
 
        if (!NT_STATUS_IS_OK(lookup_sids(tmp_ctx, 1, &sid, 1,
@@ -931,16 +950,14 @@ BOOL lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
                *ret_type = name->type;
        }
 
-       ret = True;
+       ret = true;
 
  done:
        if (ret) {
-               DEBUG(10, ("Sid %s -> %s\\%s(%d)\n",
-                          sid_string_static(sid), domain->name,
-                          name->name, name->type));
+               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_static(sid)));
+               DEBUG(10, ("failed to lookup sid %s\n", sid_string_dbg(sid)));
        }
        TALLOC_FREE(tmp_ctx);
        return ret;
@@ -980,7 +997,7 @@ static struct gid_sid_cache {
   Find a SID given a uid.
 *****************************************************************/  
 
-static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
+static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
 {
        struct uid_sid_cache *pc;
 
@@ -988,19 +1005,19 @@ static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
                if (pc->uid == uid) {
                        *psid = pc->sid;
                        DEBUG(3,("fetch sid from uid cache %u -> %s\n",
-                                (unsigned int)uid, sid_string_static(psid)));
+                                (unsigned int)uid, sid_string_dbg(psid)));
                        DLIST_PROMOTE(uid_sid_cache_head, pc);
-                       return True;
+                       return true;
                }
        }
-       return False;
+       return false;
 }
 
 /*****************************************************************
   Find a uid given a SID.
 *****************************************************************/  
 
-static BOOL fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
+static bool fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
 {
        struct uid_sid_cache *pc;
 
@@ -1008,12 +1025,12 @@ static BOOL fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid )
                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)));
+                                (unsigned int)*puid, sid_string_dbg(psid)));
                        DLIST_PROMOTE(uid_sid_cache_head, pc);
-                       return True;
+                       return true;
                }
        }
-       return False;
+       return false;
 }
 
 /*****************************************************************
@@ -1057,7 +1074,7 @@ void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
   Find a SID given a gid.
 *****************************************************************/  
 
-static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
+static bool fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
 {
        struct gid_sid_cache *pc;
 
@@ -1065,19 +1082,19 @@ static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
                if (pc->gid == gid) {
                        *psid = pc->sid;
                        DEBUG(3,("fetch sid from gid cache %u -> %s\n",
-                                (unsigned int)gid, sid_string_static(psid)));
+                                (unsigned int)gid, sid_string_dbg(psid)));
                        DLIST_PROMOTE(gid_sid_cache_head, pc);
-                       return True;
+                       return true;
                }
        }
-       return False;
+       return false;
 }
 
 /*****************************************************************
   Find a gid given a SID.
 *****************************************************************/  
 
-static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
+static bool fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
 {
        struct gid_sid_cache *pc;
 
@@ -1085,12 +1102,12 @@ static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
                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)));
+                                (unsigned int)*pgid, sid_string_dbg(psid)));
                        DLIST_PROMOTE(gid_sid_cache_head, pc);
-                       return True;
+                       return true;
                }
        }
-       return False;
+       return false;
 }
 
 /*****************************************************************
@@ -1128,8 +1145,8 @@ void store_gid_sid_cache(const DOM_SID *psid, gid_t 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)));
+       DEBUG(3,("store_gid_sid_cache: gid %u in cache -> %s\n",
+                (unsigned int)gid, sid_string_dbg(psid)));
 
        n_gid_sid_cache++;
 }
@@ -1141,7 +1158,7 @@ void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
 static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
 {
        uint32 rid;
-       BOOL ret;
+       bool ret;
 
        ZERO_STRUCTP(psid);
 
@@ -1162,7 +1179,7 @@ static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
 
  done:
        DEBUG(10,("LEGACY: uid %u -> sid %s\n", (unsigned int)uid,
-                 sid_string_static(psid)));
+                 sid_string_dbg(psid)));
 
        store_uid_sid_cache(psid, uid);
        return;
@@ -1174,7 +1191,7 @@ static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
 
 static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
 {
-       BOOL ret;
+       bool ret;
 
        ZERO_STRUCTP(psid);
 
@@ -1193,7 +1210,7 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
 
  done:
        DEBUG(10,("LEGACY: gid %u -> sid %s\n", (unsigned int)gid,
-                 sid_string_static(psid)));
+                 sid_string_dbg(psid)));
 
        store_gid_sid_cache(psid, gid);
        return;
@@ -1203,14 +1220,14 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
  *THE LEGACY* convert SID to uid function.
 *****************************************************************/  
 
-static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
+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;
+               bool ret;
 
                become_root();
                ret = pdb_sid_to_id(psid, &id, &type);
@@ -1219,9 +1236,9 @@ static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
                if (ret) {
                        if (type != SID_NAME_USER) {
                                DEBUG(5, ("sid %s is a %s, expected a user\n",
-                                         sid_string_static(psid),
+                                         sid_string_dbg(psid),
                                          sid_type_lookup(type)));
-                               return False;
+                               return false;
                        }
                        *puid = id.uid;
                        goto done;
@@ -1230,15 +1247,16 @@ static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
                /* This was ours, but it was not mapped.  Fail */
        }
 
-       DEBUG(10,("LEGACY: mapping failed for sid %s\n", sid_string_static(psid)));
-       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_static(psid),
-               (unsigned int)*puid ));
+       DEBUG(10,("LEGACY: sid %s -> uid %u\n", sid_string_dbg(psid),
+                 (unsigned int)*puid ));
 
        store_uid_sid_cache(psid, *puid);
-       return True;
+       return true;
 }
 
 /*****************************************************************
@@ -1246,7 +1264,7 @@ done:
  Group mapping is used for gids that maps to Wellknown SIDs
 *****************************************************************/  
 
-static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
+static bool legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
        uint32 rid;
        GROUP_MAP map;
@@ -1255,7 +1273,7 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 
        if ((sid_check_is_in_builtin(psid) ||
             sid_check_is_in_wellknown_domain(psid))) {
-               BOOL ret;
+               bool ret;
 
                become_root();
                ret = pdb_getgrsid(&map, *psid);
@@ -1265,12 +1283,13 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                        *pgid = map.gid;
                        goto done;
                }
-               DEBUG(10,("LEGACY: mapping failed for sid %s\n", sid_string_static(psid)));
-               return False;
+               DEBUG(10,("LEGACY: mapping failed for sid %s\n",
+                         sid_string_dbg(psid)));
+               return false;
        }
 
        if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
-               BOOL ret;
+               bool ret;
 
                become_root();
                ret = pdb_sid_to_id(psid, &id, &type);
@@ -1279,10 +1298,10 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                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),
+                               DEBUG(5, ("LEGACY: sid %s is a %s, expected "
+                                         "a group\n", sid_string_dbg(psid),
                                          sid_type_lookup(type)));
-                               return False;
+                               return false;
                        }
                        *pgid = id.gid;
                        goto done;
@@ -1291,16 +1310,17 @@ static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                /* This was ours, but it was not mapped.  Fail */
        }
 
-       DEBUG(10,("LEGACY: mapping failed for sid %s\n", sid_string_static(psid)));
-       return False;
+       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_static(psid),
+       DEBUG(10,("LEGACY: sid %s -> gid %u\n", sid_string_dbg(psid),
                  (unsigned int)*pgid ));
 
        store_gid_sid_cache(psid, *pgid);
 
-       return True;
+       return true;
 }
 
 /*****************************************************************
@@ -1325,8 +1345,8 @@ void uid_to_sid(DOM_SID *psid, uid_t uid)
                return;
        }
 
-       DEBUG(10,("uid %u -> sid %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;
@@ -1354,8 +1374,8 @@ void gid_to_sid(DOM_SID *psid, gid_t gid)
                return;
        }
 
-       DEBUG(10,("gid %u -> sid %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;
@@ -1365,16 +1385,16 @@ void gid_to_sid(DOM_SID *psid, gid_t gid)
  *THE CANONICAL* convert SID to uid function.
 *****************************************************************/  
 
-BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid)
+bool sid_to_uid(const DOM_SID *psid, uid_t *puid)
 {
        uint32 rid;
        gid_t gid;
 
        if (fetch_uid_from_cache(puid, psid))
-               return True;
+               return true;
 
        if (fetch_gid_from_cache(&gid, psid)) {
-               return False;
+               return false;
        }
 
        /* Optimize for the Unix Users Domain
@@ -1384,9 +1404,9 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid)
                *puid = uid;
 
                /* return here, don't cache */
-               DEBUG(10,("sid %s -> uid %u\n", sid_string_static(psid),
+               DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
                        (unsigned int)*puid ));
-               return True;
+               return true;
        }
 
        if (!winbind_sid_to_uid(puid, psid)) {
@@ -1395,18 +1415,18 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid)
                }
 
                DEBUG(5, ("winbind failed to find a uid for sid %s\n",
-                         sid_string_static(psid)));
-               return False;
+                         sid_string_dbg(psid)));
+               return false;
        }
 
        /* 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),
+       DEBUG(10,("sid %s -> uid %u\n", sid_string_dbg(psid),
                (unsigned int)*puid ));
 
        store_uid_sid_cache(psid, *puid);
-       return True;
+       return true;
 }
 
 /*****************************************************************
@@ -1414,16 +1434,16 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid)
  Group mapping is used for gids that maps to Wellknown SIDs
 *****************************************************************/  
 
-BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid)
+bool sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
        uint32 rid;
        uid_t uid;
 
        if (fetch_gid_from_cache(pgid, psid))
-               return True;
+               return true;
 
        if (fetch_uid_from_cache(&uid, psid))
-               return False;
+               return false;
 
        /* Optimize for the Unix Groups Domain
         * as the conversion is straightforward */
@@ -1432,9 +1452,9 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                *pgid = gid;
 
                /* return here, don't cache */
-               DEBUG(10,("sid %s -> gid %u\n", sid_string_static(psid),
+               DEBUG(10,("sid %s -> gid %u\n", sid_string_dbg(psid),
                        (unsigned int)*pgid ));
-               return True;
+               return true;
        }
 
        /* Ask winbindd if it can map this sid to a gid.
@@ -1446,15 +1466,15 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                }
 
                DEBUG(10,("winbind failed to find a gid for sid %s\n",
-                                       sid_string_static(psid)));
-               return False;
+                         sid_string_dbg(psid)));
+               return false;
        }
 
-       DEBUG(10,("sid %s -> gid %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 True;
+       return true;
 }