From 98226d2ffb6bcca1b56d0358cd28ad69b90f895c Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Mon, 2 Nov 2015 18:55:14 +0100
Subject: [PATCH] doveadm sieve plugin: Added proper handling of Sieve storage
initialization failure occurring when sieve_enabled=no
---
src/plugins/doveadm-sieve/doveadm-sieve-cmd.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
index ff3b42a11..e1e79796d 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
@@ -131,8 +131,14 @@ doveadm_sieve_cmd_run
(ctx->svinst, user, SIEVE_STORAGE_FLAG_READWRITE, &error);
if ( ctx->storage == NULL ) {
switch ( error ) {
+ case SIEVE_ERROR_NOT_POSSIBLE:
+ error = SIEVE_ERROR_NOT_FOUND;
+ i_error("Failed to open Sieve storage: "
+ "Sieve is disabled for this user");
+ break;
case SIEVE_ERROR_NOT_FOUND:
- i_error("Failed to open Sieve storage: Sieve disabled for user");
+ i_error("Failed to open Sieve storage: "
+ "User cannot manage personal Sieve scripts.");
break;
default:
i_error("Failed to open Sieve storage.");
--
GitLab