lib-storage: Add MAIL_ERROR_LIMIT

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 20dfb6a194cad0454e080977c7be30f033c44a05..b4557ab38952d97ca3df36c178441d169db142a0 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -53,13 +53,12 @@ int doveadm_killed_signo(void)
 void doveadm_mail_failed_error(struct doveadm_mail_cmd_context *ctx,
                               enum mail_error error)
 {
-       int exit_code = 0;
+       int exit_code = EX_TEMPFAIL;
 
        switch (error) {
        case MAIL_ERROR_NONE:
                i_unreached();
        case MAIL_ERROR_TEMP:
-               exit_code = EX_TEMPFAIL;
                break;
        case MAIL_ERROR_NOTPOSSIBLE:
        case MAIL_ERROR_EXISTS:
@@ -81,7 +80,9 @@ void doveadm_mail_failed_error(struct doveadm_mail_cmd_context *ctx,
                break;
        case MAIL_ERROR_EXPUNGED:
        case MAIL_ERROR_INUSE:
-               exit_code = EX_TEMPFAIL;
+               break;
+       case MAIL_ERROR_LIMIT:
+               exit_code = DOVEADM_EX_NOTPOSSIBLE;
                break;
        }
        /* tempfail overrides all other exit codes, otherwise use whatever

diff --git a/src/imap/imap-commands-util.c b/src/imap/imap-commands-util.c
index 6886f4f43fb7ecaf8920a2b3adc741ca07415fc9..d724077231c2bcfbe46836c16dee632688303404 100644 (file)
--- a/src/imap/imap-commands-util.c
+++ b/src/imap/imap-commands-util.c
@@ -169,6 +169,9 @@ imap_get_error_string(struct client_command_context *cmd,
        case MAIL_ERROR_CONVERSION:
        case MAIL_ERROR_INVALIDDATA:
                break;
+       case MAIL_ERROR_LIMIT:
+               resp_code = IMAP_RESP_CODE_LIMIT;
+               break;
        }
        if (resp_code == NULL || *error_string == '[')
                return t_strconcat("NO ", error_string, NULL);

diff --git a/src/lib-storage/index/dbox-multi/mdbox-map.c b/src/lib-storage/index/dbox-multi/mdbox-map.c
index 59bc749ba4680eb3773e601c1c414b6bcbedc625..b597ad2637835c93c3117d1fcaf14af13724ca88 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-map.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-map.c
@@ -674,7 +674,7 @@ int mdbox_map_update_refcount(struct mdbox_map_transaction_context *ctx,
                /* we're getting close to the 64k limit. fail early
                   to make it less likely that two processes increase
                   the refcount enough times to cross the limit */
-               mail_storage_set_error(MAP_STORAGE(map), MAIL_ERROR_NOTPOSSIBLE,
+               mail_storage_set_error(MAP_STORAGE(map), MAIL_ERROR_LIMIT,
                        t_strdup_printf("Message has been copied too many times (%d + %d)",
                                        old_diff, new_diff));
                return -1;

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index b916bc4440bb9c8ff78e4347dce4c5d414a2ff18..b2df83daf8504fa876427026313344a78a600519 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -45,7 +45,7 @@ static struct imapc_resp_code_map imapc_resp_code_map[] = {
        { IMAP_RESP_CODE_SERVERBUG, MAIL_ERROR_TEMP },
        /* { IMAP_RESP_CODE_CLIENTBUG, 0 }, */
        { IMAP_RESP_CODE_CANNOT, MAIL_ERROR_NOTPOSSIBLE },
-       { IMAP_RESP_CODE_LIMIT, MAIL_ERROR_NOTPOSSIBLE },
+       { IMAP_RESP_CODE_LIMIT, MAIL_ERROR_LIMIT },
        { IMAP_RESP_CODE_OVERQUOTA, MAIL_ERROR_NOQUOTA },
        { IMAP_RESP_CODE_ALREADYEXISTS, MAIL_ERROR_EXISTS },
        { IMAP_RESP_CODE_NONEXISTENT, MAIL_ERROR_NOTFOUND }

diff --git a/src/lib-storage/mail-error.h b/src/lib-storage/mail-error.h
index 420f01b66263c311257c96863e6295de4bb60cd9..4b111788693d221d48bd510f0c3c1da19c56fe7b 100644 (file)
--- a/src/lib-storage/mail-error.h
+++ b/src/lib-storage/mail-error.h
@@ -47,6 +47,8 @@ enum mail_error {
        /* Can't do the requested data conversion because the original data
           isn't valid. */
        MAIL_ERROR_INVALIDDATA,
+       /* Operation ran against some kind of a limit. */
+       MAIL_ERROR_LIMIT,
 };
 
 /* Convert errno to mail_error and an error string. Returns TRUE if successful,