From 021dfe8f33b3d21ec16ac6e4a28f5a1d09b838a3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 24 May 2024 18:48:29 +0200 Subject: [PATCH] winbind: Modernize a few DEBUGs Signed-off-by: Volker Lendecke Reviewed-by: Andrew Bartlett --- source3/winbindd/winbindd_ccache_access.c | 29 ++++++++++------------- source3/winbindd/winbindd_pam.c | 17 +++++-------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c index cc395ad3bda..36e7ab0c890 100644 --- a/source3/winbindd/winbindd_ccache_access.c +++ b/source3/winbindd/winbindd_ccache_access.c @@ -210,8 +210,8 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) &name_domain, &name_user); if (!ok) { - DEBUG(5,("winbindd_ccache_ntlm_auth: cannot parse domain and user from name [%s]\n", - state->request->data.ccache_ntlm_auth.user)); + DBG_INFO("cannot parse domain and user from name [%s]\n", + state->request->data.ccache_ntlm_auth.user); return false; } @@ -221,8 +221,7 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) domain = find_auth_domain(state->request->flags, name_domain); if (domain == NULL) { - DEBUG(5,("winbindd_ccache_ntlm_auth: can't get domain [%s]\n", - name_domain)); + DBG_INFO("can't get domain [%s]\n", name_domain); return false; } @@ -240,11 +239,11 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) initial_blob_len + challenge_blob_len < initial_blob_len || initial_blob_len + challenge_blob_len < challenge_blob_len) { - DEBUG(10,("winbindd_dual_ccache_ntlm_auth: blob lengths overrun " - "or wrap. Buffer [%d+%d > %d]\n", - initial_blob_len, - challenge_blob_len, - extra_len)); + DBG_DEBUG("blob lengths overrun " + "or wrap. Buffer [%d+%d > %d]\n", + initial_blob_len, + challenge_blob_len, + extra_len); goto process_result; } @@ -258,21 +257,19 @@ bool winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state) &name_domain, &name_user); if (!ok) { - DEBUG(10,("winbindd_dual_ccache_ntlm_auth: cannot parse " - "domain and user from name [%s]\n", - state->request->data.ccache_ntlm_auth.user)); + DBG_DEBUG("cannot parse domain and user from name [%s]\n", + state->request->data.ccache_ntlm_auth.user); goto process_result; } entry = find_memory_creds_by_name(state->request->data.ccache_ntlm_auth.user); if (entry == NULL || entry->nt_hash == NULL || entry->lm_hash == NULL) { - DEBUG(10,("winbindd_dual_ccache_ntlm_auth: could not find " - "credentials for user %s\n", - state->request->data.ccache_ntlm_auth.user)); + DBG_DEBUG("could not find credentials for user %s\n", + state->request->data.ccache_ntlm_auth.user); goto process_result; } - DEBUG(10,("winbindd_dual_ccache_ntlm_auth: found ccache [%s]\n", entry->username)); + DBG_DEBUG("found ccache [%s]\n", entry->username); if (!client_can_access_ccache_entry(state->request->data.ccache_ntlm_auth.uid, entry)) { goto process_result; diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index e12972aa56d..450030fcbf1 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -898,13 +898,11 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, } if (logon_info == NULL) { - DEBUG(10,("Missing logon_info in ticket of %s\n", - principal_s)); + DBG_DEBUG("Missing logon_info in ticket of %s\n", principal_s); return NT_STATUS_INVALID_PARAMETER; } - DEBUG(10,("winbindd_raw_kerberos_login: winbindd validated ticket of %s\n", - principal_s)); + DBG_DEBUG("winbindd validated ticket of %s\n", principal_s); result = create_info6_from_pac(mem_ctx, logon_info, upn_dns_info, &info6_copy); @@ -935,8 +933,8 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, canon_realm); if (!NT_STATUS_IS_OK(result)) { - DEBUG(10,("winbindd_raw_kerberos_login: failed to add ccache to list: %s\n", - nt_errstr(result))); + DBG_DEBUG("failed to add ccache to list: %s\n", + nt_errstr(result)); } } @@ -959,9 +957,7 @@ failed: * cache entirely now */ if (!NT_STATUS_IS_OK(remove_ccache(user))) { - DEBUG(3,("winbindd_raw_kerberos_login: " - "could not remove ccache for user %s\n", - user)); + DBG_NOTICE("could not remove ccache for user %s\n", user); } return result; @@ -986,8 +982,7 @@ bool check_request_flags(uint32_t flags) return true; } - DEBUG(1, ("check_request_flags: invalid request flags[0x%08X]\n", - flags)); + DBG_WARNING("invalid request flags[0x%08X]\n", flags); return false; } -- 2.47.3