From 4857df2321bc011ffd5bcd966b9df384bbc58d98 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Tue, 8 Oct 2019 22:57:02 +0200 Subject: [PATCH] lib-smtp: smtp-params - Add smtp_params_rcpt_has_orcpt(). Evaluates whether ORCPT parameter is present. --- src/lib-smtp/smtp-params.c | 2 +- src/lib-smtp/smtp-params.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib-smtp/smtp-params.c b/src/lib-smtp/smtp-params.c index d47c066798..9cec2146e4 100644 --- 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 f8023e5f84..86970f49f8 100644 --- 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, -- 2.47.3