lib-smtp: smtp-params - Add smtp_params_rcpt_has_orcpt().

Evaluates whether ORCPT parameter is present.

diff --git a/src/lib-smtp/smtp-params.c b/src/lib-smtp/smtp-params.c
index d47c066798ea534eee429ca25ad3d4cf3e70a4ef..9cec2146e4d95c1a3a3df8ee13db276b8039566e 100644 (file)
--- a/src/lib-smtp/smtp-params.c
+++ b/src/lib-smtp/smtp-params.c
@@ -1137,7 +1137,7 @@ static void
 smtp_params_rcpt_write_orcpt(string_t *buffer, enum smtp_capability caps,
                             const struct smtp_params_rcpt *params)
 {
-       if (params->orcpt.addr_type == NULL)
+       if (!smtp_params_rcpt_has_orcpt(params))
                return;
        if ((caps & SMTP_CAPABILITY_DSN) == 0 &&
            (caps & SMTP_CAPABILITY__ORCPT) == 0)

diff --git a/src/lib-smtp/smtp-params.h b/src/lib-smtp/smtp-params.h
index f8023e5f84f9691e0f9e29e47eafb42b0eb9e617..86970f49f803177bff92a69ebbe2a5b140cf81c0 100644 (file)
--- a/src/lib-smtp/smtp-params.h
+++ b/src/lib-smtp/smtp-params.h
@@ -166,6 +166,12 @@ smtp_params_rcpt_get_extra(const struct smtp_params_rcpt *params,
 bool smtp_params_rcpt_equals(const struct smtp_params_rcpt *params1,
                             const struct smtp_params_rcpt *params2);
 
+static inline bool
+smtp_params_rcpt_has_orcpt(const struct smtp_params_rcpt *params)
+{
+       return (params->orcpt.addr_type != NULL);
+}
+
 /* events */
 
 void smtp_params_rcpt_add_to_event(const struct smtp_params_rcpt *params,