diff options
-rw-r--r-- | source3/lib/privileges.c | 11 | ||||
-rw-r--r-- | source3/lib/util_sid.c | 3 | ||||
-rw-r--r-- | source3/lib/util_wellknown.c | 7 | ||||
-rw-r--r-- | source3/lib/winbind_util.c | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index c02d4c9884c..19412133342 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -168,13 +168,16 @@ bool get_privileges_for_sids(uint64_t *privileges, struct dom_sid *slist, int sc *privileges = 0; for ( i=0; i<scount; i++ ) { + struct dom_sid_buf buf; + /* don't add unless we actually have a privilege assigned */ if ( !get_privileges( &slist[i], &mask ) ) continue; DEBUG(5,("get_privileges_for_sids: sid = %s\nPrivilege " - "set: 0x%llx\n", sid_string_dbg(&slist[i]), + "set: 0x%llx\n", + dom_sid_str_buf(&slist[i], &buf), (unsigned long long)mask)); *privileges |= mask; @@ -341,6 +344,7 @@ NTSTATUS privilege_enum_sids(enum sec_privilege privilege, TALLOC_CTX *mem_ctx, static bool grant_privilege_bitmap(const struct dom_sid *sid, const uint64_t priv_mask) { uint64_t old_mask, new_mask; + struct dom_sid_buf buf; ZERO_STRUCT( old_mask ); ZERO_STRUCT( new_mask ); @@ -352,7 +356,7 @@ static bool grant_privilege_bitmap(const struct dom_sid *sid, const uint64_t pri new_mask |= priv_mask; - DEBUG(10,("grant_privilege: %s\n", sid_string_dbg(sid))); + DEBUG(10,("grant_privilege: %s\n", dom_sid_str_buf(sid, &buf))); DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)new_mask)); @@ -398,13 +402,14 @@ bool grant_privilege_set(const struct dom_sid *sid, struct lsa_PrivilegeSet *set static bool revoke_privilege_bitmap(const struct dom_sid *sid, const uint64_t priv_mask) { uint64_t mask; + struct dom_sid_buf buf; /* if the user has no privileges, then we can't revoke any */ if ( !get_privileges( sid, &mask ) ) return True; - DEBUG(10,("revoke_privilege: %s\n", sid_string_dbg(sid))); + DEBUG(10,("revoke_privilege: %s\n", dom_sid_str_buf(sid, &buf))); DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)mask)); diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 0e79a6ef2f0..71a4800d602 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -175,8 +175,9 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx, status = add_sid_to_array(mem_ctx, info3->sids[i].sid, &sid_array, &num_sids); if (!NT_STATUS_IS_OK(status)) { + struct dom_sid_buf buf; DEBUG(3, ("could not add SID to array: %s\n", - sid_string_dbg(info3->sids[i].sid))); + dom_sid_str_buf(info3->sids[i].sid, &buf))); return status; } } diff --git a/source3/lib/util_wellknown.c b/source3/lib/util_wellknown.c index a3db9ab5b44..8cb7a36ddec 100644 --- a/source3/lib/util_wellknown.c +++ b/source3/lib/util_wellknown.c @@ -116,6 +116,7 @@ bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, struct dom_sid dom_sid; uint32_t rid; const struct rid_name_map *users = NULL; + struct dom_sid_buf buf; sid_copy(&dom_sid, sid); if (!sid_split_rid(&dom_sid, &rid)) { @@ -133,7 +134,8 @@ bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, } if (users == NULL) { - DEBUG(10, ("SID %s is no special sid\n", sid_string_dbg(sid))); + DEBUG(10, ("SID %s is no special sid\n", + dom_sid_str_buf(sid, &buf))); return False; } @@ -144,7 +146,8 @@ bool lookup_wellknown_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, } } - DEBUG(10, ("RID of special SID %s not found\n", sid_string_dbg(sid))); + DEBUG(10, ("RID of special SID %s not found\n", + dom_sid_str_buf(sid, &buf))); return False; } diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c index 427831f04c8..a072166ce18 100644 --- a/source3/lib/winbind_util.c +++ b/source3/lib/winbind_util.c @@ -94,6 +94,7 @@ bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, enum wbcSidType type; char *domain_name = NULL; char *account_name = NULL; + struct dom_sid_buf buf; memcpy(&dom_sid, sid, sizeof(dom_sid)); @@ -112,7 +113,7 @@ bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, *name_type = (enum lsa_SidType)type; DEBUG(10, ("winbind_lookup_sid: SUCCESS: SID %s -> %s %s\n", - sid_string_dbg(sid), domain_name, account_name)); + dom_sid_str_buf(sid, &buf), domain_name, account_name)); wbcFreeMemory(domain_name); wbcFreeMemory(account_name); |