split-protocols

Updated: Mon, 25 Nov 2013 20:11:59 -0500
Forwarded: no (Debian-specific)

Set default protocols value as empty and enable each
protocol in its own configuration file

Gbp-Pq: Name split-protocols.patch

diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf
index b67e9eb4a424e60a561f466fb6d71806e04560bb..7e9953fd4592e4f3b12f378c04365b47515b2c42 100644 (file)
--- 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 submission
+# 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 a76242c88abc61f09044a6bdec34a621e00b0de9..fbac595ffabc0abd71ee480852d01fe55631a913 100644 (file)
--- a/src/config/all-settings.c
+++ b/src/config/all-settings.c
@@ -4100,7 +4100,7 @@ struct master_settings master_default_settings = {
        .state_dir = PKG_STATEDIR,
        .libexec_dir = PKG_LIBEXECDIR,
        .instance_name = PACKAGE,
-       .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 7cfaa35a30e51de7344588c4cb726fa0983066f0..48a9121ae44b5a0a4ebf1deb0333d50fb812eb34 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -207,7 +207,7 @@ static const struct master_settings master_default_settings = {
        .state_dir = PKG_STATEDIR,
        .libexec_dir = PKG_LIBEXECDIR,
        .instance_name = PACKAGE,
-       .protocols = "imap pop3 lmtp",
+       .protocols = "",
        .listen = "*, ::",
        .ssl = "yes:no:required",
        .default_internal_user = "dovecot",