Skip to content
Snippets Groups Projects
Commit e37583a9 authored by Stephan Bosch's avatar Stephan Bosch
Browse files

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.
parent dc20a45f
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.