dovecot-2.0-pigeonhole: Reverted ManageSieve protocol name back ...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Thu Jan 28 10:38:49 EET 2010
details: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/24248f4b02d3
changeset: 1227:24248f4b02d3
user: Stephan Bosch <stephan at rename-it.nl>
date: Thu Jan 28 09:38:36 2010 +0100
description:
Reverted ManageSieve protocol name back from 'sieve' to 'managesieve'.
diffstat:
INSTALL | 12 ++++++------
doc/example-config/conf.d/managesieve.conf | 6 +++---
src/managesieve-login/client.c | 4 ++--
src/managesieve-login/managesieve-login-settings.c | 6 +++---
src/managesieve/main.c | 6 +++---
src/managesieve/managesieve-settings.c | 8 ++++----
6 files changed, 21 insertions(+), 21 deletions(-)
diffs (185 lines):
diff -r 985f5212b6c6 -r 24248f4b02d3 INSTALL
--- a/INSTALL Wed Jan 27 19:59:34 2010 +0100
+++ b/INSTALL Thu Jan 28 09:38:36 2010 +0100
@@ -288,7 +288,7 @@
There are two things to have be done to activate the ManageSieve support in
Dovecot:
- - The first step is to add `sieve' to the protocols= configuration line in
+ - The first step is to add `managesieve' to the protocols= configuration line in
your dovecot.conf.
- The next step is specifying an additional service type for the ManageSieve
@@ -298,7 +298,7 @@
For example:
- service sieve-login {
+ service managesieve-login {
inet_listener {
port = 4190
}
@@ -306,7 +306,7 @@
Because the implementation of the ManageSieve daemon is largely based on the
original IMAP implementation, it is very similar in terms of configuration. The
-following settings can be configured in the 'protocol sieve' section:
+following settings can be configured in the 'protocol managesieve' section:
managesieve_max_line_length = 65536
The maximum ManageSieve command line length in bytes. This setting is directly
@@ -361,7 +361,7 @@
# *** conf.d/managesieve.conf ***
-service sieve-login {
+service managesieve-login {
inet_listener {
# Bind the daemon only to the specified address(es)
# (default: *, ::)
@@ -372,7 +372,7 @@
}
}
-protocol sieve {
+protocol managesieve {
managesieve_sieve_capability = fileinto reject
}
@@ -388,7 +388,7 @@
# .... (other config items)
# Start imap, pop3, lmtp and managesieve services
-protocols = imap pop3 lmtp sieve
+protocols = imap pop3 lmtp managesieve
# .... (other config items)
diff -r 985f5212b6c6 -r 24248f4b02d3 doc/example-config/conf.d/managesieve.conf
--- a/doc/example-config/conf.d/managesieve.conf Wed Jan 27 19:59:34 2010 +0100
+++ b/doc/example-config/conf.d/managesieve.conf Thu Jan 28 09:38:36 2010 +0100
@@ -4,7 +4,7 @@
# Service definitions
-service sieve-login {
+service managesieve-login {
inet_listener {
port = 4190
}
@@ -21,14 +21,14 @@
#vsz_limit = 64M
}
-service sieve {
+service managesieve {
# Max. number of ManageSieve processes (connections)
#process_count = 1024
}
# Service configuration
-protocol sieve {
+protocol managesieve {
# 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 -r 985f5212b6c6 -r 24248f4b02d3 src/managesieve-login/client.c
--- a/src/managesieve-login/client.c Wed Jan 27 19:59:34 2010 +0100
+++ b/src/managesieve-login/client.c Thu Jan 28 09:38:36 2010 +0100
@@ -28,8 +28,8 @@
/* Disconnect client when it sends too many bad commands */
#define CLIENT_MAX_BAD_COMMANDS 10
-const char *login_protocol = "sieve";
-const char *login_process_name = "sieve-login";
+const char *login_protocol = "managesieve";
+const char *login_process_name = "managesieve-login";
unsigned int login_default_port = 4190;
void login_process_preinit(void)
diff -r 985f5212b6c6 -r 24248f4b02d3 src/managesieve-login/managesieve-login-settings.c
--- a/src/managesieve-login/managesieve-login-settings.c Wed Jan 27 19:59:34 2010 +0100
+++ b/src/managesieve-login/managesieve-login-settings.c Thu Jan 28 09:38:36 2010 +0100
@@ -10,8 +10,8 @@
#include <stddef.h>
struct service_settings managesieve_login_settings_service_settings = {
- .name = "sieve-login",
- .protocol = "sieve",
+ .name = "managesieve-login",
+ .protocol = "managesieve",
.type = "login",
.executable = "managesieve-login",
.user = "dovecot",
@@ -55,7 +55,7 @@
};
static const struct setting_parser_info managesieve_login_setting_parser_info = {
- .module_name = "sieve-login",
+ .module_name = "managesieve-login",
.defines = managesieve_login_setting_defines,
.defaults = &managesieve_login_default_settings,
diff -r 985f5212b6c6 -r 24248f4b02d3 src/managesieve/main.c
--- a/src/managesieve/main.c Wed Jan 27 19:59:34 2010 +0100
+++ b/src/managesieve/main.c Thu Jan 28 09:38:36 2010 +0100
@@ -171,7 +171,7 @@
buffer_t *input_buf;
memset(&input, 0, sizeof(input));
- input.module = input.service = "sieve";
+ input.module = input.service = "managesieve";
input.username = getenv("USER");
if (input.username == NULL && IS_STANDALONE())
input.username = getlogin();
@@ -200,7 +200,7 @@
buffer_t input_buf;
memset(&input, 0, sizeof(input));
- input.module = input.service = "sieve";
+ input.module = input.service = "managesieve";
input.local_ip = client->auth_req.local_ip;
input.remote_ip = client->auth_req.remote_ip;
input.username = username;
@@ -257,7 +257,7 @@
MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
}
- master_service = master_service_init("sieve", service_flags,
+ master_service = master_service_init("managesieve", service_flags,
&argc, &argv, NULL);
if (master_getopt(master_service) > 0)
return FATAL_DEFAULT;
diff -r 985f5212b6c6 -r 24248f4b02d3 src/managesieve/managesieve-settings.c
--- a/src/managesieve/managesieve-settings.c Wed Jan 27 19:59:34 2010 +0100
+++ b/src/managesieve/managesieve-settings.c Thu Jan 28 09:38:36 2010 +0100
@@ -17,7 +17,7 @@
/* <settings checks> */
static struct file_listener_settings managesieve_unix_listeners_array[] = {
- { "login/sieve", 0666, "", "" }
+ { "login/managesieve", 0666, "", "" }
};
static struct file_listener_settings *managesieve_unix_listeners[] = {
&managesieve_unix_listeners_array[0]
@@ -28,8 +28,8 @@
/* </settings checks> */
struct service_settings managesieve_settings_service_settings = {
- .name = "sieve",
- .protocol = "sieve",
+ .name = "managesieve",
+ .protocol = "managesieve",
.type = "",
.executable = "managesieve",
.user = "",
@@ -93,7 +93,7 @@
};
const struct setting_parser_info managesieve_setting_parser_info = {
- .module_name = "sieve",
+ .module_name = "managesieve",
.defines = managesieve_setting_defines,
.defaults = &managesieve_default_settings,
More information about the dovecot-cvs
mailing list