From: Timo Sirainen Date: Fri, 28 Feb 2025 10:33:45 +0000 (+0200) Subject: global: For Pro edition, default verbose_proctitle=yes X-Git-Tag: 2.4.1~92 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=411802bac1bc3bafe3f5d64bbdaa40f0d210a106;p=thirdparty%2Fdovecot%2Fcore.git global: For Pro edition, default verbose_proctitle=yes --- diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c index 2ab2bac1e4..4022444f68 100644 --- 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 3d2033b69f..fa3e3716a1 100644 --- 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 e66865e1db..e659be9a01 100644 --- 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 f5fb704c66..c5e3129dc0 100644 --- 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 24d32ca3f3..ed836016fe 100644 --- 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 bae0b54252..34c1d5dadf 100644 --- 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 cde0f3df11..d37870030f 100644 --- 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 +/* */ +#ifdef DOVECOT_PRO_EDITION +# define VERBOSE_PROCTITLE_DEFAULT TRUE +#else +# define VERBOSE_PROCTITLE_DEFAULT FALSE +#endif +/* */ + struct master_service; struct master_service_settings { diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c index 73b4bb3c79..e7b57f913d 100644 --- 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 bca5003901..8cf3921e76 100644 --- 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 61bcc478c0..6176025a92 100644 --- 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 = "",