From fe8fbf1fae370e2ac512287c9650beea1b9ec817 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sat, 19 Jun 2010 10:57:23 +0200
Subject: [PATCH] Changed ManageSieve protocol name to 'sieve'.

---
 doc/example-config/conf.d/20-managesieve.conf      | 2 +-
 src/managesieve-login/managesieve-login-settings.c | 4 ++--
 src/managesieve/managesieve-settings.c             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/example-config/conf.d/20-managesieve.conf b/doc/example-config/conf.d/20-managesieve.conf
index 26c4ccd7a..96044026b 100644
--- a/doc/example-config/conf.d/20-managesieve.conf
+++ b/doc/example-config/conf.d/20-managesieve.conf
@@ -32,7 +32,7 @@ service managesieve {
 
 # Service configuration
 
-protocol managesieve {
+protocol sieve {
   # Maximum ManageSieve command line length in bytes. Some clients generate very long
   # command lines with huge mailboxes, so you may need to raise this if you get
   # "Too long argument" or "ManageSieve command line too large" errors often.
diff --git a/src/managesieve-login/managesieve-login-settings.c b/src/managesieve-login/managesieve-login-settings.c
index b20847c4b..a3c011586 100644
--- a/src/managesieve-login/managesieve-login-settings.c
+++ b/src/managesieve-login/managesieve-login-settings.c
@@ -24,7 +24,7 @@ static bool managesieve_login_settings_verify
 #endif
 
 static struct inet_listener_settings managesieve_login_inet_listeners_array[] = {
-    { "managesieve", "", 4190, FALSE },
+    { "sieve", "", 4190, FALSE },
 };
 static struct inet_listener_settings *managesieve_login_inet_listeners[] = {
 	&managesieve_login_inet_listeners_array[0]
@@ -36,7 +36,7 @@ static buffer_t managesieve_login_inet_listeners_buf = {
 
 struct service_settings managesieve_login_settings_service_settings = {
 	.name = "managesieve-login",
-	.protocol = "managesieve",
+	.protocol = "sieve",
 	.type = "login",
 	.executable = "managesieve-login",
 	.user = "$default_login_user",
diff --git a/src/managesieve/managesieve-settings.c b/src/managesieve/managesieve-settings.c
index 0d98ab676..f58836d04 100644
--- a/src/managesieve/managesieve-settings.c
+++ b/src/managesieve/managesieve-settings.c
@@ -29,7 +29,7 @@ static buffer_t managesieve_unix_listeners_buf = {
 
 struct service_settings managesieve_settings_service_settings = {
 	.name = "managesieve",
-	.protocol = "managesieve",
+	.protocol = "sieve",
 	.type = "",
 	.executable = "managesieve",
 	.user = "",
-- 
GitLab