From e37583a9da8df336401f8e9c01fa27cd3f8a52e5 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 28 Aug 2017 13:04:40 +0200
Subject: [PATCH] sieve-filter: Removed (now) duplicate utf8 to mutf7 mailbox
name conversion.
The Dovecot API was changed years ago, but apparently sieve-filter was never updated.
---
src/sieve-tools/sieve-filter.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/sieve-tools/sieve-filter.c b/src/sieve-tools/sieve-filter.c
index 4a2b91a8b..65c19cb39 100644
--- a/src/sieve-tools/sieve-filter.c
+++ b/src/sieve-tools/sieve-filter.c
@@ -12,7 +12,6 @@
#include "mail-namespace.h"
#include "mail-storage.h"
#include "mail-search-build.h"
-#include "imap-utf7.h"
#include "sieve.h"
#include "sieve-extensions.h"
@@ -348,16 +347,6 @@ static int filter_mailbox
return ret;
}
-static const char *mailbox_name_to_mutf7(const char *mailbox_utf8)
-{
- string_t *str = t_str_new(128);
-
- if (imap_utf8_to_utf7(mailbox_utf8, str) < 0)
- return mailbox_utf8;
- else
- return str_c(str);
-}
-
/*
* Tool implementation
*/
@@ -520,7 +509,6 @@ int main(int argc, char **argv)
/* Open the source mailbox */
- src_mailbox = mailbox_name_to_mutf7(src_mailbox);
ns = mail_namespace_find(mail_user->namespaces, src_mailbox);
if ( ns == NULL )
i_fatal("Unknown namespace for source mailbox '%s'", src_mailbox);
@@ -538,7 +526,6 @@ int main(int argc, char **argv)
if ( execute && discard_action == SIEVE_FILTER_DACT_MOVE &&
move_mailbox != NULL ) {
- move_mailbox = mailbox_name_to_mutf7(move_mailbox);
ns = mail_namespace_find(mail_user->namespaces, move_mailbox);
if ( ns == NULL )
i_fatal("Unknown namespace for mailbox '%s'", move_mailbox);
--
GitLab