lib-smtp: smtp-server-reply - Add smtp_server_reply_is_success() and use it.

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 0e7ecf8a6d876f8cf68999447a2c15b1fb2cbe31..a7f2d49795b007784da49cb50f2532787b326609 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -613,8 +613,7 @@ bool smtp_server_command_replied_success(struct smtp_server_command *cmd)
                        array_idx(&cmd->replies, i);
                if (!reply->submitted)
                        return FALSE;
-               i_assert(reply->content != NULL);
-               if (reply->content->status / 100 == 2)
+               if (smtp_server_reply_is_success(reply))
                        success = TRUE;
        }
 

diff --git a/src/lib-smtp/smtp-server-reply.c b/src/lib-smtp/smtp-server-reply.c
index ac926099bd1ef7ba3a46a77ebf21d7af22ffd6b5..2069116d9a0bb1576161a454ff6b49186a28bdea 100644 (file)
--- a/src/lib-smtp/smtp-server-reply.c
+++ b/src/lib-smtp/smtp-server-reply.c
@@ -488,6 +488,12 @@ int smtp_server_reply_send(struct smtp_server_reply *reply)
        return ret;
 }
 
+bool smtp_server_reply_is_success(const struct smtp_server_reply *reply)
+{
+       i_assert(reply->content != NULL);
+       return (reply->content->status / 100 == 2);
+}
+
 /*
  * EHLO reply
  */

diff --git a/src/lib-smtp/smtp-server.h b/src/lib-smtp/smtp-server.h
index 152508d801f10afecfabb47e92ac97dc481d9248..d1d64144831b5a356ce7d8eb09b8ba4cea346a53 100644 (file)
--- a/src/lib-smtp/smtp-server.h
+++ b/src/lib-smtp/smtp-server.h
@@ -650,6 +650,8 @@ void smtp_server_reply_early(struct smtp_server_cmd_ctx *_cmd,
 /* Reply the command with a 221 bye message */
 void smtp_server_reply_quit(struct smtp_server_cmd_ctx *_cmd);
 
+bool smtp_server_reply_is_success(const struct smtp_server_reply *reply);
+
 /* EHLO */
 
 struct smtp_server_reply *