Kolab Groupware OBS

Changes of Revision 14

0001-Backwards-compatibility-for-the-sync-protocol-withou.patch Changed

@@ -1,15 +1,15 @@
-From e12d8ea15dbab5f56f1b3915c1578e9d5f3fefa9 Mon Sep 17 00:00:00 2001
+From d45b77b5d13108009c4ecd09bc15c032b527fdba Mon Sep 17 00:00:00 2001
 From: Christian Mollekopf <mollekopf@apheleia-it.ch>
 Date: Wed, 17 May 2023 18:16:09 +0200
 Subject: PATCH Backwards compatibility for the sync protocol without MODSEQ
 
 Required after 9d4d5069230d699c34e9c8410f0bd1df9ae3040a
 ---
- imap/sync_support.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
+ imap/sync_support.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/imap/sync_support.c b/imap/sync_support.c
-index f2699108a..d71b6f614 100755
+index f2699108a..0b43f15d0 100755
 --- a/imap/sync_support.c
 +++ b/imap/sync_support.c
 @@ -1420,8 +1420,11 @@ int decode_annotations(/*const*/struct dlist *annots,
@@ -26,13 +26,11 @@
          if (!dlist_getbuf(aa, "VALUE", &value))
              return IMAP_PROTOCOL_BAD_PARAMETERS;
          if (!strcmp(entry, IMAP_ANNOT_NS "thrid") &&
-@@ -2996,10 +2999,10 @@ int sync_apply_mailbox(struct dlist *kin,
- 
+@@ -2997,9 +3000,9 @@ int sync_apply_mailbox(struct dlist *kin,
      /* take all mailbox (not message) annotations - aka metadata,
       * they're not versioned either */
--    if (ka)
+     if (ka)
 -        decode_annotations(ka, &mannots, mailbox, NULL);
-+    if (ka) {
 +        r = decode_annotations(ka, &mannots, mailbox, NULL);
  
 -    r = read_annotations(mailbox, NULL, &rannots, 0, 0);