Revert "JMAP: treat IMAP_NO_OVERQUOTA the same as IMAP_QUOTA_EXCEEDED"

This reverts commit 0772404.
cyrusimap · May 15, 2024 · cfe4c2c · cfe4c2c
1 parent 1513790
commit cfe4c2c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/imap/jmap_calendar.c b/imap/jmap_calendar.c
@@ -4767,7 +4767,6 @@ static void setcalendarevents_create(jmap_req_t *req,
                 *errptr = json_pack("{s:s}", "type", "forbidden");
                 break;
             case IMAP_QUOTA_EXCEEDED:
-            case IMAP_NO_OVERQUOTA:
                 *errptr = json_pack("{s:s}", "type", "overQuota");
                 break;
             case IMAP_MESSAGE_TOO_LARGE:
@@ -5801,7 +5800,6 @@ static void setcalendarevents_update(jmap_req_t *req,
                     break;
                 case HTTP_NO_STORAGE:
                 case IMAP_QUOTA_EXCEEDED:
-                case IMAP_NO_OVERQUOTA:
                     *err = json_pack("{s:s}", "type", "overQuota");
                     break;
                 case IMAP_MESSAGE_TOO_LARGE:

diff --git a/imap/jmap_contact.c b/imap/jmap_contact.c
@@ -1137,7 +1137,6 @@ static void _contacts_set(struct jmap_req *req, unsigned kind,
                     err = json_pack("{s:s}", "type", "forbidden");
                     break;
                 case IMAP_QUOTA_EXCEEDED:
-                case IMAP_NO_OVERQUOTA:
                     err = json_pack("{s:s}", "type", "overQuota");
                     break;
                 case IMAP_MESSAGE_TOO_LARGE:
@@ -1207,7 +1206,6 @@ static void _contacts_set(struct jmap_req *req, unsigned kind,
                 err = json_pack("{s:s}", "type", "forbidden");
                 break;
             case IMAP_QUOTA_EXCEEDED:
-            case IMAP_NO_OVERQUOTA:
                 err = json_pack("{s:s}", "type", "overQuota");
                 break;
             case IMAP_MESSAGE_TOO_LARGE:

diff --git a/imap/jmap_mail.c b/imap/jmap_mail.c
@@ -9027,7 +9027,6 @@ static void _email_append(jmap_req_t *req,
                 *err = json_pack("{s:s s:s}", "type", "alreadyExists", "existingId", detail->email_id);
                 break;
             case IMAP_QUOTA_EXCEEDED:
-            case IMAP_NO_OVERQUOTA:
                 *err = json_pack("{s:s}", "type", "overQuota");
                 break;
             case IMAP_MESSAGE_CONTAINSNULL:
@@ -10925,7 +10924,7 @@ static void _email_create(jmap_req_t *req,
 done:
     if (r && *set_err == NULL) {
         syslog(LOG_ERR, "jmap: email_create: %s", error_message(r));
-        if (r == IMAP_QUOTA_EXCEEDED || r == IMAP_NO_OVERQUOTA)
+        if (r == IMAP_QUOTA_EXCEEDED)
             *set_err = json_pack("{s:s}", "type", "overQuota");
         else
             *set_err = jmap_server_error(r);