From: Timo Sirainen Date: Thu, 9 Apr 2020 19:43:34 +0000 (+0300) Subject: *-login: Use e_info() instead of client_log() X-Git-Tag: 2.3.11.2~220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59964080252600e2edc708a8d2b4f39554a77660;p=thirdparty%2Fdovecot%2Fcore.git *-login: Use e_info() instead of client_log() --- diff --git a/src/imap-login/imap-login-cmd-id.c b/src/imap-login/imap-login-cmd-id.c index cde640efe6..a1c6294651 100644 --- a/src/imap-login/imap-login-cmd-id.c +++ b/src/imap-login/imap-login-cmd-id.c @@ -199,8 +199,8 @@ static void cmd_id_finish(struct imap_client *client) client->id_logged = TRUE; if (client->cmd_id->log_reply != NULL) { - client_log(&client->common, t_strdup_printf( - "ID sent: %s", str_c(client->cmd_id->log_reply))); + e_info(client->common.event, "ID sent: %s", + str_c(client->cmd_id->log_reply)); } } diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c index 799d886fd0..89d122e992 100644 --- a/src/login-common/client-common-auth.c +++ b/src/login-common/client-common-auth.c @@ -302,7 +302,7 @@ void client_proxy_log_failure(struct client *client, const char *line) str_printfa(str, " (master %s)", client->proxy_master_user); str_append(str, ": "); str_append(str, line); - client_log(client, str_c(str)); + e_info(client->event, "%s", str_c(str)); } void client_proxy_failed(struct client *client, bool send_line) @@ -779,8 +779,8 @@ client_auth_begin_common(struct client *client, const char *mech_name, { if (!client->secured && strcmp(client->ssl_set->ssl, "required") == 0) { if (client->set->auth_verbose) { - client_log(client, "Login failed: " - "SSL required for authentication"); + e_info(client->event, "Login failed: " + "SSL required for authentication"); } client->auth_attempts++; client_auth_result(client, CLIENT_AUTH_RESULT_SSL_REQUIRED, NULL, @@ -824,8 +824,8 @@ bool client_check_plaintext_auth(struct client *client, bool pass_sent) return TRUE; if (client->set->auth_verbose) { - client_log(client, "Login failed: " - "Plaintext authentication disabled"); + e_info(client->event, "Login failed: " + "Plaintext authentication disabled"); } if (pass_sent) { client_notify_status(client, TRUE, diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c index 518941f599..e99d684e52 100644 --- a/src/login-common/client-common.c +++ b/src/login-common/client-common.c @@ -265,7 +265,7 @@ void client_disconnect(struct client *client, const char *reason) reason = t_strconcat(reason, " ", extra_reason, NULL); } if (reason != NULL) - client_log(client, reason); + e_info(client->event, "%s", reason); if (client->output != NULL) o_stream_uncork(client->output); @@ -498,7 +498,7 @@ int client_init_ssl(struct client *client) i_assert(client->fd != -1); if (strcmp(client->ssl_set->ssl, "no") == 0) { - client_log(client, "SSL is disabled (ssl=no)"); + e_info(client->event, "SSL is disabled (ssl=no)"); return -1; } diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c index a0934b0274..6c694ed192 100644 --- a/src/login-common/login-proxy.c +++ b/src/login-common/login-proxy.c @@ -499,12 +499,11 @@ login_proxy_free_full(struct login_proxy **_proxy, const char *reason, delay_ms = login_proxy_delay_disconnect(proxy); ipstr = net_ip2addr(&proxy->client->ip); - client_log(proxy->client, t_strdup_printf( - "proxy(%s): disconnecting %s%s%s", - proxy->client->virtual_user, - ipstr != NULL ? ipstr : "", - reason == NULL ? "" : t_strdup_printf(" (%s)", reason), - delay_ms == 0 ? "" : t_strdup_printf(" - disconnecting client in %ums", delay_ms))); + e_info(proxy->client->event, "proxy(%s): disconnecting %s%s%s", + proxy->client->virtual_user, + ipstr != NULL ? ipstr : "", + reason == NULL ? "" : t_strdup_printf(" (%s)", reason), + delay_ms == 0 ? "" : t_strdup_printf(" - disconnecting client in %ums", delay_ms)); i_assert(detached_login_proxies_count > 0); detached_login_proxies_count--; diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c index 137f5c41e4..27b90b148b 100644 --- a/src/login-common/sasl-server.c +++ b/src/login-common/sasl-server.c @@ -518,8 +518,8 @@ sasl_server_auth_cancel(struct client *client, const char *reason, if (client->set->auth_verbose && reason != NULL) { const char *auth_name = str_sanitize(client->auth_mech_name, MAX_MECH_NAME); - client_log(client, t_strdup_printf( - "Authenticate %s failed: %s", auth_name, reason)); + e_info(client->event, "Authenticate %s failed: %s", + auth_name, reason); } client->authenticating = FALSE; diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c index b65409bc81..a42ea23f34 100644 --- a/src/pop3-login/client-authenticate.c +++ b/src/pop3-login/client-authenticate.c @@ -174,7 +174,7 @@ bool cmd_apop(struct pop3_client *pop3_client, const char *args) if (pop3_client->apop_challenge == NULL) { if (client->set->auth_verbose) - client_log(client, "APOP failed: APOP not enabled"); + e_info(client->event, "APOP failed: APOP not enabled"); client_send_reply(client, POP3_CMD_REPLY_ERROR, "APOP not enabled."); return TRUE; @@ -184,7 +184,7 @@ bool cmd_apop(struct pop3_client *pop3_client, const char *args) p = strchr(args, ' '); if (p == NULL || strlen(p+1) != 32) { if (client->set->auth_verbose) - client_log(client, "APOP failed: Invalid parameters"); + e_info(client->event, "APOP failed: Invalid parameters"); client_send_reply(client, POP3_CMD_REPLY_ERROR, "Invalid parameters."); return TRUE; @@ -199,8 +199,8 @@ bool cmd_apop(struct pop3_client *pop3_client, const char *args) if (hex_to_binary(p+1, apop_data) < 0) { if (client->set->auth_verbose) { - client_log(client, "APOP failed: " - "Invalid characters in MD5 response"); + e_info(client->event, "APOP failed: " + "Invalid characters in MD5 response"); } client_send_reply(client, POP3_CMD_REPLY_ERROR, "Invalid characters in MD5 response.");