File cyrus-imapd-3.0.13-fix-cmdline-backups-mboxname... of Package cyrus-imapd

Overview Repositories Revisions Requests Users Attributes Meta

File cyrus-imapd-3.0.13-fix-cmdline-backups-mboxnames.patch of Package cyrus-imapd (Revision bd0a5a636da984332cdf878aca07b7f2)

Currently displaying revision bd0a5a636da984332cdf878aca07b7f2 , Show latest

From 02782464ddd612d41519c106dd00628fe775e760 Mon Sep 17 00:00:00 2001
From: ellie timoney <ellie@fastmail.com>
Date: Wed, 29 Jan 2020 10:59:08 +1100
Subject: [PATCH] backups: cmdline mboxnames are admin ns, not intnames, part
 2: electric boogaloo

Part of #2920
---
 backup/cyr_backup.c | 4 +++-
 backup/restore.c    | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/backup/cyr_backup.c b/backup/cyr_backup.c
index a159c7fda..3ca394bce 100644
--- a/backup/cyr_backup.c
+++ b/backup/cyr_backup.c
@@ -545,7 +545,9 @@ static int cmd_show_mailboxes(struct backup *backup,
 
         /* or it could be an mboxname */
         if (!mailbox) {
-            mbname_t *mbname = mbname_from_intname(arg);
+            mbname_t *mbname = mbname_from_extname(arg,
+                                                   &cyr_backup_namespace,
+                                                   NULL);
             if (!mbname) continue;
             mailbox = backup_get_mailbox_by_name(backup, mbname,
                                                  BACKUP_MAILBOX_ALL_RECORDS);
diff --git a/backup/restore.c b/backup/restore.c
index bd99f5021..b22258aca 100644
--- a/backup/restore.c
+++ b/backup/restore.c
@@ -940,14 +940,16 @@ static int restore_add_object(const char *object_name,
     }
     else if (strchr(object_name, '.')) {
         /* has a dot, might be an mboxname */
-        mbname_t *mbname = mbname_from_intname(object_name);
+        mbname_t *mbname = mbname_from_extname(object_name,
+                                               &restore_namespace, NULL);
         mailbox = backup_get_mailbox_by_name(backup, mbname,
                                              BACKUP_MAILBOX_ALL_RECORDS);
         mbname_free(&mbname);
     }
     else {
         /* not sure what it is, guess mboxname? */
-        mbname_t *mbname = mbname_from_intname(object_name);
+        mbname_t *mbname = mbname_from_extname(object_name,
+                                               &restore_namespace, NULL);
         mailbox = backup_get_mailbox_by_name(backup, mbname,
                                              BACKUP_MAILBOX_ALL_RECORDS);
         mbname_free(&mbname);

Places

File cyrus-imapd-3.0.13-fix-cmdline-backups-mboxnames.patch of Package cyrus-imapd (Revision bd0a5a636da984332cdf878aca07b7f2)

Places