From 900288a2b86abd247f9eb4cd15dc5617a17cfef1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 15 Dec 2007 21:11:36 +0100 Subject: Replace sid_string_static by sid_string_dbg in DEBUGs (This used to be commit bb35e794ec129805e874ceba882bcc1e84791a09) --- source3/auth/auth_util.c | 8 ++++---- source3/auth/token_util.c | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'source3/auth') diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 0d4caecb2d..1e33869ea9 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -669,7 +669,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info) if (!sid_to_gid(sid, &gid)) { DEBUG(10, ("Could not convert SID %s to gid, " - "ignoring it\n", sid_string_static(sid))); + "ignoring it\n", sid_string_dbg(sid))); continue; } add_gid_to_array_unique(server_info, gid, &server_info->groups, @@ -740,7 +740,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, if (!sid_to_uid(&user_sid, uid)) { DEBUG(1, ("sid_to_uid for %s (%s) failed\n", - username, sid_string_static(&user_sid))); + username, sid_string_dbg(&user_sid))); goto done; } @@ -762,7 +762,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, if (!ret) { DEBUG(1, ("pdb_getsampwsid(%s) for user %s failed\n", - sid_string_static(&user_sid), username)); + sid_string_dbg(&user_sid), username)); DEBUGADD(1, ("Fall back to unix user %s\n", username)); goto unix_user; } @@ -864,7 +864,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, if (!sid_to_gid(&group_sids[0], gid)) { DEBUG(1, ("sid_to_gid(%s) failed\n", - sid_string_static(&group_sids[0]))); + sid_string_dbg(&group_sids[0]))); goto done; } diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 330acde6e4..2415a90b02 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -280,7 +280,8 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx, NTSTATUS status; gid_t gid; - DEBUG(10, ("Create local NT token for %s\n", sid_string_static(user_sid))); + DEBUG(10, ("Create local NT token for %s\n", + sid_string_dbg(user_sid))); if (!(result = TALLOC_ZERO_P(mem_ctx, NT_USER_TOKEN))) { DEBUG(0, ("talloc failed\n")); @@ -434,13 +435,13 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token) DEBUGC(dbg_class, dbg_lev, ("NT user token of user %s\n", - sid_string_static(&token->user_sids[0]) )); + sid_string_dbg(&token->user_sids[0]) )); DEBUGADDC(dbg_class, dbg_lev, ("contains %lu SIDs\n", (unsigned long)token->num_sids)); for (i = 0; i < token->num_sids; i++) DEBUGADDC(dbg_class, dbg_lev, ("SID[%3lu]: %s\n", (unsigned long)i, - sid_string_static(&token->user_sids[i]))); + sid_string_dbg(&token->user_sids[i]))); dump_se_priv( dbg_class, dbg_lev, &token->privileges ); } -- cgit