From 1b6fb01a996015ca89f7aa73f5d3ace05d37bd53 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@dovecot.fi>
Date: Thu, 14 Apr 2016 20:52:04 +0200
Subject: [PATCH] lib-sieve: Don't add overridden built-in extensions to the
 capability list.

These are not available under that name anymore and when the replacing extension has the same bare name, this would have led to duplicate capabilities.
---
 src/lib-sieve/sieve-extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 487fd44a1..69bb4ddd1 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -570,7 +570,7 @@ const struct sieve_extension *sieve_extension_get_by_name
 static inline bool _sieve_extension_listable(const struct sieve_extension *ext)
 {
 	return ( ext->enabled && ext->def != NULL && *(ext->def->name) != '@'
-		&& !ext->dummy && !ext->global );
+		&& !ext->dummy && !ext->global && !ext->overridden);
 }
 
 const char *sieve_extensions_get_string(struct sieve_instance *svinst)
-- 
GitLab