summaryrefslogtreecommitdiffstats
path: root/src/qmgr
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/qmgr/qmgr.c2
-rw-r--r--src/qmgr/qmgr_deliver.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qmgr/qmgr.c b/src/qmgr/qmgr.c
index 9d90a6e..25168e4 100644
--- a/src/qmgr/qmgr.c
+++ b/src/qmgr/qmgr.c
@@ -206,7 +206,7 @@
/* parameter value, where \fItransport\fR is the master.cf name of
/* the message delivery transport.
/* .IP "\fBdefault_recipient_refill_delay (5s)\fR"
-/* The default per-transport maximum delay between recipients refills.
+/* The default per-transport maximum delay between refilling recipients.
/* .IP "\fBtransport_recipient_refill_delay ($default_recipient_refill_delay)\fR"
/* A transport-specific override for the default_recipient_refill_delay
/* parameter value, where \fItransport\fR is the master.cf name of
diff --git a/src/qmgr/qmgr_deliver.c b/src/qmgr/qmgr_deliver.c
index 577bb98..6c880ce 100644
--- a/src/qmgr/qmgr_deliver.c
+++ b/src/qmgr/qmgr_deliver.c
@@ -160,7 +160,7 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
*/
for (recipient = list.info; recipient < list.info + list.len; recipient++)
if (var_smtputf8_enable && (addr = recipient->address)[0]
- && !allascii(addr) && valid_utf8_string(addr, strlen(addr))) {
+ && !allascii(addr) && valid_utf8_stringz(addr)) {
smtputf8 |= SMTPUTF8_FLAG_RECIPIENT;
if (message->verp_delims)
smtputf8 |= SMTPUTF8_FLAG_SENDER;
@@ -339,7 +339,7 @@ static void qmgr_deliver_update(int unused_event, void *context)
#define SUSPENDED "delivery temporarily suspended: "
if (status == DELIVER_STAT_CRASH)
- DSN_SIMPLE(&dsb->dsn, "4.3.0", "unknown mail transport error");
+ (void) DSN_SIMPLE(&dsb->dsn, "4.3.0", "unknown mail transport error");
if (status == DELIVER_STAT_CRASH || status == DELIVER_STAT_DEFER) {
message->flags |= DELIVER_STAT_DEFER;
if (VSTRING_LEN(dsb->status)) {