lib-smtp: smtp-server - Remove redundant debug logging checks.

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 5659e433739d82f5d28b1f881613d0243c97310a..8e15d7772959d39d2728ce977058f991cb67357b 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -130,14 +130,11 @@ void smtp_server_command_debug(struct smtp_server_cmd_ctx *cmd,
                               const char *format, ...)
 {
        struct smtp_server_connection *conn = cmd->conn;
-       const struct smtp_server_settings *set = &conn->set;
        va_list args;
 
-       if (set->debug) {
-               va_start(args, format);
-               e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
-               va_end(args);
-       }
+       va_start(args, format);
+       e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
+       va_end(args);
 }
 
 /*

diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index da858c788fb3776c2dae8bdf2c129cdb38fa0f19..f5f26f56116dc660bfe40f6adbc3f18119650d64 100644 (file)
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -40,11 +40,9 @@ void smtp_server_connection_debug(struct smtp_server_connection *conn,
 {
        va_list args;
 
-       if (conn->set.debug) {
-               va_start(args, format);
-               e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
-               va_end(args);
-       }
+       va_start(args, format);
+       e_debug(conn->event, "%s", t_strdup_vprintf(format, args));
+       va_end(args);
 }
 
 void smtp_server_connection_error(struct smtp_server_connection *conn,

diff --git a/src/lib-smtp/smtp-server-reply.c b/src/lib-smtp/smtp-server-reply.c
index 5515e3661971676462e4bf47fb7b86f23200a161..22a8b1ad585d270ceb6cd9129071d1750145359f 100644 (file)
--- a/src/lib-smtp/smtp-server-reply.c
+++ b/src/lib-smtp/smtp-server-reply.c
@@ -17,16 +17,11 @@ static inline void ATTR_FORMAT(2, 3)
 smtp_server_reply_debug(struct smtp_server_reply *reply,
                        const char *format, ...)
 {
-       struct smtp_server_command *command = reply->command;
-       struct smtp_server_connection *conn = command->context.conn;
-       const struct smtp_server_settings *set = &conn->set;
        va_list args;
 
-       if (set->debug) {
-               va_start(args, format);
-               e_debug(reply->event, "%s", t_strdup_vprintf(format, args));
-               va_end(args);
-       }
+       va_start(args, format);
+       e_debug(reply->event, "%s", t_strdup_vprintf(format, args));
+       va_end(args);
 }
 
 /*
@@ -443,7 +438,6 @@ static int smtp_server_reply_send_real(struct smtp_server_reply *reply)
 {
        struct smtp_server_command *cmd = reply->command;
        struct smtp_server_connection *conn = cmd->context.conn;
-       const struct smtp_server_settings *set = &conn->set;
        struct ostream *output = conn->conn.output;
        string_t *textbuf;
        char *text;
@@ -466,10 +460,8 @@ static int smtp_server_reply_send_real(struct smtp_server_reply *reply)
                return -1;
        }
 
-       if (set->debug) {
-               smtp_server_reply_debug(reply, "Sent: %s",
-                       smtp_server_reply_get_one_line(reply));
-       }
+       smtp_server_reply_debug(reply, "Sent: %s",
+                               smtp_server_reply_get_one_line(reply));
        return ret;
 }