]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Reformat service listener setting defaults.
authorStephan Bosch <stephan.bosch@open-xchange.com>
Mon, 5 Aug 2019 21:46:12 +0000 (23:46 +0200)
committertimo.sirainen <timo.sirainen@open-xchange.com>
Sun, 11 Dec 2022 21:58:50 +0000 (21:58 +0000)
Use named initializers and list the items on a separate line each.

23 files changed:
src/anvil/anvil-settings.c
src/auth/auth-settings.c
src/config/config-settings.c
src/dict/dict-settings.c
src/dns/dns-client-settings.c
src/doveadm/doveadm-settings.c
src/imap-hibernate/imap-hibernate-settings.c
src/imap-login/imap-login-settings.c
src/imap-urlauth/imap-urlauth-login-settings.c
src/imap-urlauth/imap-urlauth-settings.c
src/imap-urlauth/imap-urlauth-worker-settings.c
src/imap/imap-settings.c
src/indexer/indexer-settings.c
src/indexer/indexer-worker-settings.c
src/lmtp/lmtp-settings.c
src/log/log-settings.c
src/pop3-login/pop3-login-settings.c
src/pop3/pop3-settings.c
src/replication/aggregator/aggregator-settings.c
src/replication/replicator/replicator-settings.c
src/stats/stats-settings.c
src/submission-login/submission-login-settings.c
src/submission/submission-settings.c

index 02e582eeebdead84e21a410bf4e53ce7e167a848..26d6e87917ede3b1f85556a19c5cdbaded961484 100644 (file)
@@ -9,8 +9,18 @@
 
 /* <settings checks> */
 static struct file_listener_settings anvil_unix_listeners_array[] = {
-       { "anvil", 0600, "", "" },
-       { "anvil-auth-penalty", 0600, "", "" }
+       {
+               .path = "anvil",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "anvil-auth-penalty",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *anvil_unix_listeners[] = {
        &anvil_unix_listeners_array[0],
index 74e2e40e7751ca074cce2aaa43295e392e5ee19b..aa8224aa4828b51f1fe16c4f04e75dd83c9b2d78 100644 (file)
@@ -17,12 +17,42 @@ static bool auth_userdb_settings_check(void *_set, pool_t pool, const char **err
 
 /* <settings checks> */
 static struct file_listener_settings auth_unix_listeners_array[] = {
-       { "login/login", 0666, "", "" },
-       { "token-login/tokenlogin", 0666, "", "" },
-       { "auth-login", 0600, "$default_internal_user", "" },
-       { "auth-client", 0600, "$default_internal_user", "" },
-       { "auth-userdb", 0666, "$default_internal_user", "" },
-       { "auth-master", 0600, "", "" }
+       {
+               .path = "login/login",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "token-login/tokenlogin",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "auth-login",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
+       {
+               .path = "auth-client",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
+       {
+               .path = "auth-userdb",
+               .mode = 0666,
+               .user = "$default_internal_user",
+               .group = "",
+       },
+       {
+               .path = "auth-master",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *auth_unix_listeners[] = {
        &auth_unix_listeners_array[0],
@@ -67,7 +97,12 @@ struct service_settings auth_service_settings = {
 
 /* <settings checks> */
 static struct file_listener_settings auth_worker_unix_listeners_array[] = {
-       { "auth-worker", 0600, "$default_internal_user", "" }
+       {
+               .path = "auth-worker",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
 };
 static struct file_listener_settings *auth_worker_unix_listeners[] = {
        &auth_worker_unix_listeners_array[0]
index d19fe4ec6c4bdf34ec49c76e97f76799f16e27c3..094f7b2d50405e5e16204d399922eb4bc37a9e82 100644 (file)
@@ -9,7 +9,12 @@
 
 /* <settings checks> */
 static struct file_listener_settings config_unix_listeners_array[] = {
-       { "config", 0600, "", "" }
+       {
+               .path = "config",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *config_unix_listeners[] = {
        &config_unix_listeners_array[0]
index ed9e287f10999bea698b7b14d0f6334237d6413f..4835ae739b9a0715976ba90ddead55bb2c492e26 100644 (file)
@@ -8,7 +8,12 @@
 
 /* <settings checks> */
 static struct file_listener_settings dict_unix_listeners_array[] = {
-       { "dict", 0660, "", "$default_internal_group" }
+       {
+               .path = "dict",
+               .mode = 0660,
+               .user = "",
+               .group = "$default_internal_group",
+       },
 };
 static struct file_listener_settings *dict_unix_listeners[] = {
        &dict_unix_listeners_array[0]
@@ -18,7 +23,12 @@ static buffer_t dict_unix_listeners_buf = {
 };
 
 static struct file_listener_settings dict_async_unix_listeners_array[] = {
-       { "dict-async", 0660, "", "$default_internal_group" }
+       {
+               .path = "dict-async",
+               .mode = 0660,
+               .user = "",
+               .group = "$default_internal_group",
+       },
 };
 static struct file_listener_settings *dict_async_unix_listeners[] = {
        &dict_async_unix_listeners_array[0]
index 082e73523ade350ac6ec8ad853e94bcdbadf57a6..0285057a64f96df6b33006a30f04782800414082 100644 (file)
@@ -9,8 +9,18 @@
 
 /* <settings checks> */
 static struct file_listener_settings dns_client_unix_listeners_array[] = {
-       { "dns-client", 0666, "", "" },
-       { "login/dns-client", 0666, "", "" },
+       {
+               .path = "dns-client",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "login/dns-client",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *dns_client_unix_listeners[] = {
        &dns_client_unix_listeners_array[0],
index 90a2199d7387fc1c61cc27166ec1d0201fdecf9e..b024e1c5c1ca62112f51318f491f8e7418f3cc27 100644 (file)
@@ -21,7 +21,12 @@ static bool doveadm_settings_check(void *_set, pool_t pool, const char **error_r
 
 /* <settings checks> */
 static struct file_listener_settings doveadm_unix_listeners_array[] = {
-       { "doveadm-server", 0600, "", "" }
+       {
+               .path = "doveadm-server",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *doveadm_unix_listeners[] = {
        &doveadm_unix_listeners_array[0]
index 8a09483228563fcd129145b5650acaa8c43849d8..c0cbf9386b17259109054affcd217b74471b0434 100644 (file)
 
 /* <settings checks> */
 static struct file_listener_settings imap_hibernate_unix_listeners_array[] = {
-       { "imap-hibernate", 0660, "", "$default_internal_group" },
-       { "srv.imap-hibernate/%{pid}", 0600, "", "" },
+       {
+               .path = "imap-hibernate",
+               .mode = 0660,
+               .user = "",
+               .group = "$default_internal_group",
+       },
+       {
+               .path = "srv.imap-hibernate/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_hibernate_unix_listeners[] = {
        &imap_hibernate_unix_listeners_array[0],
index a461865aa9e18b3f7a69d7d4b48ecdf1b30d5c2d..4845b521f9395cb42b4cecc2f19d25645aac4063 100644 (file)
 
 /* <settings checks> */
 static struct file_listener_settings imap_login_unix_listeners_array[] = {
-       { "srv.imap-login/%{pid}", 0600, "", "" },
+       {
+               .path = "srv.imap-login/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_login_unix_listeners[] = {
        &imap_login_unix_listeners_array[0],
@@ -21,8 +26,17 @@ static buffer_t imap_login_unix_listeners_buf = {
 };
 
 static struct inet_listener_settings imap_login_inet_listeners_array[] = {
-       { .name = "imap", .address = "", .port = 143 },
-       { .name = "imaps", .address = "", .port = 993, .ssl = TRUE }
+       {
+               .name = "imap",
+               .address = "",
+               .port = 143,
+       },
+       {
+               .name = "imaps",
+               .address = "",
+               .port = 993,
+               .ssl = TRUE,
+       },
 };
 static struct inet_listener_settings *imap_login_inet_listeners[] = {
        &imap_login_inet_listeners_array[0],
index 3dc41f69c0f41bba819903b1a92dbbf2b9491dac..552d6ecd4f34f4dc006ab6a9cf6b2a5755f899fe 100644 (file)
 /* <settings checks> */
 static struct file_listener_settings
 imap_urlauth_login_unix_listeners_array[] = {
-       { "imap-urlauth", 0666, "", "" }
+       {
+               .path = "imap-urlauth",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_urlauth_login_unix_listeners[] = {
        &imap_urlauth_login_unix_listeners_array[0]
index 73c3220cce3ba3d357457249784d491e14cfc747..6787cc54033563075d41a30a3ccf9b48a0f59206 100644 (file)
 
 /* <settings checks> */
 static struct file_listener_settings imap_urlauth_unix_listeners_array[] = {
-       { "token-login/imap-urlauth", 0666, "", "" }
+       {
+               .path = "token-login/imap-urlauth",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_urlauth_unix_listeners[] = {
        &imap_urlauth_unix_listeners_array[0]
index a459aed601f15d7deff7dfb477d12d67d8fc8f47..30dedb0a5762b14e3e0ab1d5dcdd240a9a7dfe9f 100644 (file)
 
 /* <settings checks> */
 static struct file_listener_settings imap_urlauth_worker_unix_listeners_array[] = {
-       { "imap-urlauth-worker", 0600, "$default_internal_user", "" }
+       {
+               .path = "imap-urlauth-worker",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_urlauth_worker_unix_listeners[] = {
        &imap_urlauth_worker_unix_listeners_array[0]
index 230aecbbf40b6bf5aa120b71d89a3aa6751aa75a..8cf6312f30b9cd81b136e96e26cc992a87d45b87 100644 (file)
@@ -17,9 +17,24 @@ static bool imap_settings_verify(void *_set, pool_t pool,
 
 /* <settings checks> */
 static struct file_listener_settings imap_unix_listeners_array[] = {
-       { "login/imap", 0666, "", "" },
-       { "imap-master", 0600, "", "" },
-       { "srv.imap/%{pid}", 0600, "", "" },
+       {
+               .path = "login/imap",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "imap-master",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "srv.imap/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *imap_unix_listeners[] = {
        &imap_unix_listeners_array[0],
index 837582972b1cd31855ffe64890fe151b646955da..2fdc0022a72f00ae6da728cdedf3c2c22d7e322b 100644 (file)
@@ -11,7 +11,12 @@ extern const struct setting_parser_info service_setting_parser_info;
 
 /* <settings checks> */
 static struct file_listener_settings indexer_unix_listeners_array[] = {
-       { "indexer", 0666, "", "" }
+       {
+               .path = "indexer",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *indexer_unix_listeners[] = {
        &indexer_unix_listeners_array[0]
index e7d0cb32802592ae05c86da30c5a643283cd10db..40f71deca3f7d7ec47aecda94377d1b5f329e97b 100644 (file)
@@ -9,8 +9,18 @@
 
 /* <settings checks> */
 static struct file_listener_settings indexer_worker_unix_listeners_array[] = {
-       { "indexer-worker", 0600, "$default_internal_user", "" },
-       { "srv.indexer-worker/%{pid}", 0600, "", "" },
+       {
+               .path = "indexer-worker",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
+       {
+               .path = "srv.indexer-worker/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *indexer_worker_unix_listeners[] = {
        &indexer_worker_unix_listeners_array[0],
index a2ff0e39129e0d4e6b7ba32b94d07066a5e20fe6..3ca3ec0fd3ed6b77d9a81fce66a0095e52ec3062 100644 (file)
@@ -18,7 +18,12 @@ static bool lmtp_settings_check(void *_set, pool_t pool, const char **error_r);
 
 /* <settings checks> */
 static struct file_listener_settings lmtp_unix_listeners_array[] = {
-       { "lmtp", 0666, "", "" }
+       {
+               .path = "lmtp",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *lmtp_unix_listeners[] = {
        &lmtp_unix_listeners_array[0]
index 7c55544f457d5a3b3eaac5a4a100420b2e85ea00..f2cc1a2d72444a277ba98d95c3562948f067bf9c 100644 (file)
@@ -9,7 +9,12 @@
 
 /* <settings checks> */
 static struct file_listener_settings log_unix_listeners_array[] = {
-       { "log-errors", 0600, "", "" }
+       {
+               .path = "log-errors",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *log_unix_listeners[] = {
        &log_unix_listeners_array[0]
index 91fbbee08fdd430792527a0f851a8baf056ef5dc..03759e7953a066744c826fe2812f5c31223921fc 100644 (file)
 
 /* <settings checks> */
 static struct file_listener_settings pop3_login_unix_listeners_array[] = {
-       { "srv.pop3-login/%{pid}", 0600, "", "" },
+       {
+               .path = "srv.pop3-login/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *pop3_login_unix_listeners[] = {
        &pop3_login_unix_listeners_array[0],
@@ -22,9 +27,17 @@ static buffer_t pop3_login_unix_listeners_buf = {
 };
 
 static struct inet_listener_settings pop3_login_inet_listeners_array[] = {
-       { .name = "pop3", .address = "", .port = POP3_DEFAULT_PORT },
-       { .name = "pop3s", .address = "", .port = POP3S_DEFAULT_PORT,
-         .ssl = TRUE }
+       {
+               .name = "pop3",
+               .address = "",
+               .port = POP3_DEFAULT_PORT,
+       },
+       {
+               .name = "pop3s",
+               .address = "",
+               .port = POP3S_DEFAULT_PORT,
+               .ssl = TRUE,
+       },
 };
 static struct inet_listener_settings *pop3_login_inet_listeners[] = {
        &pop3_login_inet_listeners_array[0],
index 23fea5e8189b02f22b6a2acd8ad761cb9defb422..0ab240dc11ae27c695d16771dae4fa472396e423 100644 (file)
@@ -15,8 +15,18 @@ static bool pop3_settings_verify(void *_set, pool_t pool,
 
 /* <settings checks> */
 static struct file_listener_settings pop3_unix_listeners_array[] = {
-       { "login/pop3", 0666, "", "" },
-       { "srv.pop3/%{pid}", 0600, "", "" },
+       {
+               .path = "login/pop3",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "srv.pop3/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *pop3_unix_listeners[] = {
        &pop3_unix_listeners_array[0],
index 98597bde151df4698c14116f69b4a010a059bea6..c654d102f18d9433a492d2afbb3de5bbd9760f4c 100644 (file)
@@ -8,7 +8,12 @@
 
 /* <settings checks> */
 static struct file_listener_settings aggregator_unix_listeners_array[] = {
-       { "replication-notify", 0600, "", "" }
+       {
+               .path = "replication-notify",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *aggregator_unix_listeners[] = {
        &aggregator_unix_listeners_array[0]
@@ -18,7 +23,12 @@ static buffer_t aggregator_unix_listeners_buf = {
 };
 
 static struct file_listener_settings aggregator_fifo_listeners_array[] = {
-       { "replication-notify-fifo", 0600, "", "" }
+       {
+               .path = "replication-notify-fifo",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *aggregator_fifo_listeners[] = {
        &aggregator_fifo_listeners_array[0]
index beab0a359bc1d803503741fbb37ae28f215d3381..f837aba243944380416e45aa4069612d71f4df01 100644 (file)
@@ -12,8 +12,18 @@ struct event_category event_category_replication = {
 
 /* <settings checks> */
 static struct file_listener_settings replicator_unix_listeners_array[] = {
-       { "replicator", 0600, "$default_internal_user", "" },
-       { "replicator-doveadm", 0, "$default_internal_user", "" }
+       {
+               .path = "replicator",
+               .mode = 0600,
+               .user = "$default_internal_user",
+               .group = "",
+       },
+       {
+               .path = "replicator-doveadm",
+               .mode = 0,
+               .user = "$default_internal_user",
+               .group = "",
+       },
 };
 static struct file_listener_settings *replicator_unix_listeners[] = {
        &replicator_unix_listeners_array[0],
index f75a7373d93a2139f7a86a5136b544fe5cdabe20..26404202b51f105d551961d5db775ac1e8d2d89b 100644 (file)
@@ -18,9 +18,24 @@ static bool stats_settings_check(void *_set, pool_t pool, const char **error_r);
 
 /* <settings checks> */
 static struct file_listener_settings stats_unix_listeners_array[] = {
-       { "stats-reader", 0600, "", "" },
-       { "stats-writer", 0660, "", "$default_internal_group" },
-       { "login/stats-writer", 0600, "$default_login_user", "" },
+       {
+               .path = "stats-reader",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "stats-writer",
+               .mode = 0660,
+               .user = "",
+               .group = "$default_internal_group",
+       },
+       {
+               .path = "login/stats-writer",
+               .mode = 0600,
+               .user = "$default_login_user",
+               .group = "",
+       },
 };
 static struct file_listener_settings *stats_unix_listeners[] = {
        &stats_unix_listeners_array[0],
index 5616fd17661feb951a291a237058ef6494923a76..51326e2811468017e9f2b2ae5304d42e55eda91c 100644 (file)
@@ -15,7 +15,12 @@ submission_login_settings_check(void *_set, pool_t pool, const char **error_r);
 
 /* <settings checks> */
 static struct file_listener_settings submission_login_unix_listeners_array[] = {
-       { "srv.submission-login/%{pid}", 0600, "", "" },
+       {
+               .path = "srv.submission-login/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *submission_login_unix_listeners[] = {
        &submission_login_unix_listeners_array[0],
@@ -26,8 +31,17 @@ static buffer_t submission_login_unix_listeners_buf = {
 };
 
 static struct inet_listener_settings submission_login_inet_listeners_array[] = {
-       { .name = "submission", .address = "", .port = 587  },
-       { .name = "submissions", .address = "", .port = 465, .ssl = TRUE }
+       {
+               .name = "submission",
+               .address = "",
+               .port = 587,
+       },
+       {
+               .name = "submissions",
+               .address = "",
+               .port = 465,
+               .ssl = TRUE,
+       },
 };
 static struct inet_listener_settings *submission_login_inet_listeners[] = {
        &submission_login_inet_listeners_array[0]
index 86b92d724af918a97bb78de6f4423825bd98b578..a2b4c1ba73d9569379ab50df0ed2ecc433884dfe 100644 (file)
@@ -16,8 +16,18 @@ static bool submission_settings_verify(void *_set, pool_t pool,
 
 /* <settings checks> */
 static struct file_listener_settings submission_unix_listeners_array[] = {
-       { "login/submission", 0666, "", "" },
-       { "srv.submission/%{pid}", 0600, "", "" },
+       {
+               .path = "login/submission",
+               .mode = 0666,
+               .user = "",
+               .group = "",
+       },
+       {
+               .path = "srv.submission/%{pid}",
+               .mode = 0600,
+               .user = "",
+               .group = "",
+       },
 };
 static struct file_listener_settings *submission_unix_listeners[] = {
        &submission_unix_listeners_array[0],