Package: dovecot / 1:2.2.13-12~deb8u4

split-protocols.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From: Marco Nenciarini <mnencia@debian.org>
Date: Sat, 5 Mar 2011 11:19:07 +0100
Updated: Mon, 25 Nov 2013 20:11:59 -0500
Subject: split-protocols
Description: Set default protocols value as empty and enable each
 protocol in its own configuration file
---
 doc/example-config/dovecot.conf |    4 ++--
 src/config/all-settings.c       |    2 +-
 src/master/master-settings.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf
index 5697661..c802011 100644
--- a/doc/example-config/dovecot.conf
+++ b/doc/example-config/dovecot.conf
@@ -20,8 +20,8 @@
 # options. The paths listed here are for configure --prefix=/usr
 # --sysconfdir=/etc --localstatedir=/var
 
-# Protocols we want to be serving.
-#protocols = imap pop3 lmtp
+# Enable installed protocols
+!include_try /usr/share/dovecot/protocols.d/*.protocol
 
 # A comma separated list of IPs or hosts where to listen in for connections. 
 # "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces.
diff --git a/src/config/all-settings.c b/src/config/all-settings.c
index f6ba21f..a6bb57c 100644
--- a/src/config/all-settings.c
+++ b/src/config/all-settings.c
@@ -2454,7 +2454,7 @@ struct master_settings master_default_settings = {
 	.libexec_dir = PKG_LIBEXECDIR,
 	.instance_name = PACKAGE,
 	.import_environment = "TZ CORE_OUTOFMEM CORE_ERROR" ENV_SYSTEMD ENV_GDB,
-	.protocols = "imap pop3 lmtp",
+	.protocols = "",
 	.listen = "*, ::",
 	.ssl = "yes:no:required",
 	.default_internal_user = "dovecot",
diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 4beb97d..0d574c9 100644
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -218,7 +218,7 @@ static const struct master_settings master_default_settings = {
 	.libexec_dir = PKG_LIBEXECDIR,
 	.instance_name = PACKAGE,
 	.import_environment = "TZ CORE_OUTOFMEM CORE_ERROR" ENV_SYSTEMD ENV_GDB,
-	.protocols = "imap pop3 lmtp",
+	.protocols = "",
 	.listen = "*, ::",
 	.ssl = "yes:no:required",
 	.default_internal_user = "dovecot",