lmtp: Clarify lmtp_user_concurrency_limit value of unlimited

Disallow setting this setting to 0. Make the relevant checks against
"unlimited" instead.

diff --git a/src/lmtp/lmtp-commands.c b/src/lmtp/lmtp-commands.c
index 377dd94569f0df7790d54592ff99c0565eeabee8..da4eb19f1a44df07212f50296c6e1c17282aeff4 100644 (file)
--- a/src/lmtp/lmtp-commands.c
+++ b/src/lmtp/lmtp-commands.c
@@ -35,7 +35,7 @@ int client_default_cmd_mail(struct client *client,
                            struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
                            struct smtp_server_cmd_mail *data ATTR_UNUSED)
 {
-       if (client->lmtp_set->lmtp_user_concurrency_limit > 0) {
+       if (client->lmtp_set->lmtp_user_concurrency_limit < SET_UINT_UNLIMITED) {
                /* Connect to anvil before dropping privileges */
                lmtp_anvil_init();
        }

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 6f386477e94c587efa93bc4d6c4d358aefc57dc0..9fe04559ed0046310df242118cc41f0fea758dce 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -359,7 +359,7 @@ int lmtp_local_rcpt(struct client *client,
                rcpt, SMTP_SERVER_RECIPIENT_HOOK_APPROVED,
                lmtp_local_rcpt_approved, llrcpt);
 
-       if (client->lmtp_set->lmtp_user_concurrency_limit == 0) {
+       if (client->lmtp_set->lmtp_user_concurrency_limit == SET_UINT_UNLIMITED) {
                (void)lmtp_local_rcpt_anvil_finish(llrcpt);
        } else {
                /* NOTE: username may change as the result of the userdb

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index db4db1ac57fa82acda9d26ec01b1b778a5960f05..0ecbd0e3ac36e6c68a2714db8866d03785501666 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -208,6 +208,13 @@ static bool lmtp_settings_check(void *_set, pool_t pool ATTR_UNUSED,
                                           set->lmtp_hdr_delivery_address);
                return FALSE;
        }
+
+       if (set->lmtp_user_concurrency_limit == 0) {
+               *error_r = "lmtp_user_concurrency_limit must not be 0 "
+                          "(did you mean \"unlimited\"?)";
+               return FALSE;
+       }
+
        return TRUE;
 }
 /* </settings checks> */