From: Timo Sirainen Date: Tue, 2 May 2017 14:57:40 +0000 (+0300) Subject: lmtp: Fix assert-crash when proxy overrides mail_max_lock_timeout X-Git-Tag: 2.3.0.rc1~1672 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=167dbb662c2ddedeb7b34383c18bdcf0537c0c84;p=thirdparty%2Fdovecot%2Fcore.git lmtp: Fix assert-crash when proxy overrides mail_max_lock_timeout Time unit is required or the call fails. --- diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c index 5067ab514b..7d4f04fc73 100644 --- a/src/lmtp/commands.c +++ b/src/lmtp/commands.c @@ -842,7 +842,7 @@ client_deliver(struct client *client, const struct mail_recipient *rcpt, advertised that it's going to timeout the connection. this avoids duplicate deliveries in case the delivery succeeds after the proxy has already disconnected from us. */ - line = t_strdup_printf("mail_max_lock_timeout=%u", + line = t_strdup_printf("mail_max_lock_timeout=%us", client->proxy_timeout_secs <= 1 ? 1 : client->proxy_timeout_secs-1); if (settings_parse_line(set_parser, line) < 0)