Merge pull request #4919 from cyrusimap/mailbox_messages_over_quota

mailbox.c: use the correct error code for over message quota
cyrusimap · May 15, 2024 · 930fcd9 · 930fcd9
2 parents cfe4c2c + 3d0f00b
commit 930fcd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cassandane/Cassandane/Cyrus/MaxMessages.pm b/cassandane/Cassandane/Cyrus/MaxMessages.pm
@@ -491,7 +491,7 @@ sub test_maxmsg_email_limited
     };
     my $e = $@;
     $self->assert_not_null($e);
-    $self->assert_matches(qr{over.*quota}, $e);
+    $self->assert_matches(qr{Over quota}, $e);
 
     # should have syslogged about it too
     $self->assert_syslog_matches($self->{instance},

diff --git a/imap/mailbox.c b/imap/mailbox.c
@@ -4596,7 +4596,7 @@ EXPORTED int mailbox_append_index_record(struct mailbox *mailbox,
                 xsyslog(LOG_ERR, "IOERROR: client hit per-addressbook exists limit",
                                  "mailbox=<%s>",
                                  mailbox_name(mailbox));
-                return IMAP_NO_OVERQUOTA;
+                return IMAP_QUOTA_EXCEEDED;
             }
         }
         else if (mbtype_isa(mailbox_mbtype(mailbox)) == MBTYPE_CALENDAR) {
@@ -4605,7 +4605,7 @@ EXPORTED int mailbox_append_index_record(struct mailbox *mailbox,
                 xsyslog(LOG_ERR, "IOERROR: client hit per-calendar exists limit",
                                  "mailbox=<%s>",
                                  mailbox_name(mailbox));
-                return IMAP_NO_OVERQUOTA;
+                return IMAP_QUOTA_EXCEEDED;
             }
         }
         else if (mbtype_isa(mailbox_mbtype(mailbox)) == MBTYPE_EMAIL) {
@@ -4614,7 +4614,7 @@ EXPORTED int mailbox_append_index_record(struct mailbox *mailbox,
                 xsyslog(LOG_ERR, "IOERROR: client hit per-mailbox exists limit",
                                  "mailbox=<%s>",
                                  mailbox_name(mailbox));
-                return IMAP_NO_OVERQUOTA;
+                return IMAP_QUOTA_EXCEEDED;
             }
         }
         else {