From 93dae403bbd0f43dea033902397a38051078bc08 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 6 Aug 2019 00:55:37 +0200
Subject: [PATCH] global: Reformat service listener setting defaults.
Use named initializers and list the items on a separate line each.
---
src/managesieve-login/managesieve-login-settings.c | 13 +++++++++++--
src/managesieve/managesieve-settings.c | 14 ++++++++++++--
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/managesieve-login/managesieve-login-settings.c b/src/managesieve-login/managesieve-login-settings.c
index 8e3755454..5e8cecb15 100644
--- a/src/managesieve-login/managesieve-login-settings.c
+++ b/src/managesieve-login/managesieve-login-settings.c
@@ -22,7 +22,12 @@
/* <settings checks> */
static struct file_listener_settings managesieve_login_unix_listeners_array[] = {
- { "srv.managesieve-login/%{pid}", 0600, "", "" },
+ {
+ .path = "srv.managesieve-login/%{pid}",
+ .mode = 0600,
+ .user = "",
+ .group = ""
+ },
};
static struct file_listener_settings *managesieve_login_unix_listeners[] = {
&managesieve_login_unix_listeners_array[0],
@@ -33,7 +38,11 @@ static buffer_t managesieve_login_unix_listeners_buf = {
};
static struct inet_listener_settings managesieve_login_inet_listeners_array[] = {
- { .name = "sieve", .address = "", .port = MANAGESIEVE_DEFAULT_PORT },
+ {
+ .name = "sieve",
+ .address = "",
+ .port = MANAGESIEVE_DEFAULT_PORT,
+ },
};
static struct inet_listener_settings *managesieve_login_inet_listeners[] = {
&managesieve_login_inet_listeners_array[0]
diff --git a/src/managesieve/managesieve-settings.c b/src/managesieve/managesieve-settings.c
index baba7e943..6039310ef 100644
--- a/src/managesieve/managesieve-settings.c
+++ b/src/managesieve/managesieve-settings.c
@@ -19,8 +19,18 @@ static bool managesieve_settings_verify(void *_set, pool_t pool,
/* <settings checks> */
static struct file_listener_settings managesieve_unix_listeners_array[] = {
- { "login/sieve", 0666, "", "" },
- { "srv.managesieve/%{pid}", 0600, "", "" },
+ {
+ .path = "login/sieve",
+ .mode = 0666,
+ .user = "",
+ .group = "",
+ },
+ {
+ .path = "srv.managesieve/%{pid}",
+ .mode = 0600,
+ .user = "",
+ .group = "",
+ },
};
static struct file_listener_settings *managesieve_unix_listeners[] = {
&managesieve_unix_listeners_array[0],
--
GitLab