From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 22 Oct 2023 23:26:08 +0000 (+0200)
Subject: auth: auth-request - Remove auth_request_log_*()
X-Git-Tag: 2.4.0~1878
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc98edfe9bfdfa2ae7e183c139efab4d6e96dfc9;p=thirdparty%2Fdovecot%2Fcore.git

auth: auth-request - Remove auth_request_log_*()
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 4f609c0ade..618be6bb96 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -58,8 +58,6 @@ struct auth_policy_check_ctx {
 	lookup_credentials_callback_t *callback_lookup;
 };
 
-const char auth_default_subsystems[2];
-
 unsigned int auth_request_state_count[AUTH_REQUEST_STATE_MAX];
 
 static void
@@ -129,17 +127,6 @@ const char *auth_request_get_log_prefix_db(struct auth_request *auth_request)
 	return t_strconcat(name, ": ", NULL);
 }
 
-static struct event *get_request_event(struct auth_request *request,
-				       const char *subsystem)
-{
-	if (subsystem == AUTH_SUBSYS_DB)
-		return authdb_event(request);
-	else if (subsystem == AUTH_SUBSYS_MECH && request->mech_event != NULL)
-		return request->mech_event;
-	else
-		return request->event;
-}
-
 static void
 auth_request_post_alloc_init(struct auth_request *request,
 			     struct event *parent_event)
@@ -2578,70 +2565,6 @@ enum passdb_result auth_request_password_missing(struct auth_request *request)
 	return PASSDB_RESULT_PASSWORD_MISMATCH;
 }
 
-void auth_request_log_debug(struct auth_request *auth_request,
-			    const char *subsystem,
-			    const char *format, ...)
-{
-	struct event *event = get_request_event(auth_request, subsystem);
-	va_list va;
-
-	va_start(va, format);
-	T_BEGIN {
-		string_t *str = t_str_new(128);
-		str_vprintfa(str, format, va);
-		e_debug(event, "%s", str_c(str));
-	} T_END;
-	va_end(va);
-}
-
-void auth_request_log_info(struct auth_request *auth_request,
-			   const char *subsystem,
-			   const char *format, ...)
-{
-	struct event *event = get_request_event(auth_request, subsystem);
-	va_list va;
-
-	va_start(va, format);
-	T_BEGIN {
-		string_t *str = t_str_new(128);
-		str_vprintfa(str, format, va);
-		e_info(event, "%s", str_c(str));
-	} T_END;
-	va_end(va);
-}
-
-void auth_request_log_warning(struct auth_request *auth_request,
-			      const char *subsystem,
-			      const char *format, ...)
-{
-	struct event *event = get_request_event(auth_request, subsystem);
-	va_list va;
-
-	va_start(va, format);
-	T_BEGIN {
-		string_t *str = t_str_new(128);
-		str_vprintfa(str, format, va);
-		e_warning(event, "%s", str_c(str));
-	} T_END;
-	va_end(va);
-}
-
-void auth_request_log_error(struct auth_request *auth_request,
-			    const char *subsystem,
-			    const char *format, ...)
-{
-	struct event *event = get_request_event(auth_request, subsystem);
-	va_list va;
-
-	va_start(va, format);
-	T_BEGIN {
-		string_t *str = t_str_new(128);
-		str_vprintfa(str, format, va);
-		e_error(event, "%s", str_c(str));
-	} T_END;
-	va_end(va);
-}
-
 void auth_request_refresh_last_access(struct auth_request *request)
 {
 	request->last_access = ioloop_time;
diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index 5414535fd2..9fab59cada 100644
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -244,10 +244,6 @@ typedef void auth_request_proxy_cb_t(bool success, struct auth_request *);
 
 extern unsigned int auth_request_state_count[AUTH_REQUEST_STATE_MAX];
 
-extern const char auth_default_subsystems[2];
-#define AUTH_SUBSYS_DB &auth_default_subsystems[0]
-#define AUTH_SUBSYS_MECH &auth_default_subsystems[1]
-
 struct auth_request *
 auth_request_new(const struct mech_module *mech, struct event *parent_event);
 struct auth_request *auth_request_new_dummy(struct event *parent_event);
@@ -366,19 +362,6 @@ auth_request_db_password_verify_log(struct auth_request *request,
 				    ATTR_WARN_UNUSED_RESULT;
 enum passdb_result auth_request_password_missing(struct auth_request *request);
 
-void auth_request_log_debug(struct auth_request *auth_request,
-			    const char *subsystem,
-			    const char *format, ...) ATTR_FORMAT(3, 4);
-void auth_request_log_info(struct auth_request *auth_request,
-			   const char *subsystem,
-			   const char *format, ...) ATTR_FORMAT(3, 4);
-void auth_request_log_warning(struct auth_request *auth_request,
-			      const char *subsystem,
-			      const char *format, ...) ATTR_FORMAT(3, 4);
-void auth_request_log_error(struct auth_request *auth_request,
-			    const char *subsystem,
-			    const char *format, ...) ATTR_FORMAT(3, 4);
-
 void auth_request_log_password_mismatch(struct auth_request *request,
 					struct event *event);
 void auth_request_log_unknown_user(struct auth_request *auth_request,