global: For Pro edition, default verbose_proctitle=yes

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 2ab2bac1e478c636d224ad217b62373fd93a5076..4022444f6858dad5a2827a0283d03ea5c783b06a 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -397,7 +397,7 @@ static const struct auth_settings auth_default_settings = {
        .userdbs = ARRAY_INIT,
 
        .base_dir = PKG_RUNDIR,
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
        .first_valid_uid = 500,
        .last_valid_uid = 0,
        .first_valid_gid = 1,

diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c
index 3d2033b69f6ef310a4b213b5855403b6ea386ef6..fa3e3716a108c4543d7c0da53878e39a6b48665c 100644 (file)
--- a/src/dict/dict-settings.c
+++ b/src/dict/dict-settings.c
@@ -4,6 +4,7 @@
 #include "buffer.h"
 #include "settings-parser.h"
 #include "service-settings.h"
+#include "master-service-settings.h"
 #include "dict-settings.h"
 
 struct service_settings dict_service_settings = {
@@ -100,7 +101,7 @@ static const struct setting_define dict_setting_defines[] = {
 
 const struct dict_server_settings dict_default_settings = {
        .base_dir = PKG_RUNDIR,
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
 };
 
 const struct setting_parser_info dict_server_setting_parser_info = {

diff --git a/src/imap-urlauth/imap-urlauth-settings.c b/src/imap-urlauth/imap-urlauth-settings.c
index e66865e1db6e50b316198589b1daa5286772a7b9..e659be9a01b41129e43f2cf48bd87747cfdfad3f 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-settings.c
+++ b/src/imap-urlauth/imap-urlauth-settings.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "buffer.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "service-settings.h"
 #include "imap-urlauth-settings.h"
 
@@ -61,7 +62,7 @@ const struct imap_urlauth_settings imap_urlauth_default_settings = {
        .base_dir = PKG_RUNDIR,
   .mail_debug = FALSE,
 
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
 
        .imap_urlauth_logout_format = "in=%{input} out=%{output}",
        .imap_urlauth_submit_user = "",

diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c
index f5fb704c66be2b0aef3348b77fdb8ae66ae80dfd..c5e3129dc085d8bfaf220ca7b9e3cd18a51882f8 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker-settings.c
+++ b/src/imap-urlauth/imap-urlauth-worker-settings.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "buffer.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "service-settings.h"
 #include "mail-storage-settings.h"
 #include "imap-urlauth-worker-common.h"
@@ -57,7 +58,7 @@ static const struct setting_define imap_urlauth_worker_setting_defines[] = {
 };
 
 const struct imap_urlauth_worker_settings imap_urlauth_worker_default_settings = {
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
 
        .imap_urlauth_host = "",
        .imap_urlauth_port = 143

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 24d32ca3f302de597e510c0a8b2d17fc05feb38a..ed836016fefa1d56d17ff6f0e66df5f93f3f797f 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "service-settings.h"
 #include "imap-settings.h"
 
@@ -90,7 +91,7 @@ static const struct setting_define imap_setting_defines[] = {
 };
 
 static const struct imap_settings imap_default_settings = {
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
        .rawlog_dir = "",
 
        /* RFC-2683 recommends at least 8000 bytes. Some clients however don't

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index bae0b54252c2dd0a0286024a0c89a1a92db64a30..34c1d5dadfb729cc50d524514ee03ef1d3c02554 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -77,7 +77,7 @@ static const struct master_service_settings master_service_default_settings = {
        .dovecot_storage_version = "",
        .version_ignore = FALSE,
        .shutdown_clients = TRUE,
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
 
        .haproxy_trusted_networks = "",
        .haproxy_timeout = 3

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index cde0f3df11659c6724386f1759007f8593625a3e..d37870030fe436c4cc241f73fc9b02f57d6109a3 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -1,6 +1,14 @@
 #ifndef MASTER_SERVICE_SETTINGS_H
 #define MASTER_SERVICE_SETTINGS_H
 
+/* <settings checks> */
+#ifdef DOVECOT_PRO_EDITION
+#  define VERBOSE_PROCTITLE_DEFAULT TRUE
+#else
+#  define VERBOSE_PROCTITLE_DEFAULT FALSE
+#endif
+/* </settings checks> */
+
 struct master_service;
 
 struct master_service_settings {

diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index 73b4bb3c791016d39569792e10acc75039825d15..e7b57f913d1becc9e84ea6a52f36038b19a10d33 100644 (file)
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -2,6 +2,7 @@
 
 #include "login-common.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "login-settings.h"
 #include "settings-parser.h"
 
@@ -64,7 +65,7 @@ static const struct login_settings login_default_settings = {
        .auth_allow_cleartext = FALSE,
        .auth_verbose = FALSE,
        .auth_debug = FALSE,
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
 
        .ssl = "yes:no:required",
 

diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index bca50039014062729b02e18a9b66495a6f1239b5..8cf3921e761da0c4cc348f66b25807a43637899d 100644 (file)
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "buffer.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "service-settings.h"
 #include "mail-storage-settings.h"
 #include "pop3-settings.h"
@@ -77,7 +78,7 @@ static const struct setting_define pop3_setting_defines[] = {
 };
 
 static const struct pop3_settings pop3_default_settings = {
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
        .rawlog_dir = "",
 
        .pop3_no_flag_updates = FALSE,

diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index 61bcc478c07b53908f67eeaea7900d646467f8be..6176025a92f5c6a94cee46b7183f733221933ab8 100644 (file)
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -4,6 +4,7 @@
 #include "hostpid.h"
 #include "buffer.h"
 #include "settings-parser.h"
+#include "master-service-settings.h"
 #include "service-settings.h"
 #include "mail-storage-settings.h"
 #include "submission-settings.h"
@@ -101,7 +102,7 @@ static const struct setting_define submission_setting_defines[] = {
 };
 
 static const struct submission_settings submission_default_settings = {
-       .verbose_proctitle = FALSE,
+       .verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
        .rawlog_dir = "",
 
        .hostname = "",