imap/pop3/submission-login: Add srv.<name>/%{pid}-admin unix socket listener

This can be used by admin clients.

diff --git a/src/imap-login/imap-login-settings.c b/src/imap-login/imap-login-settings.c
index 74ab65c7b8fbebfe79e61b5818547d3e5b67eb26..a461865aa9e18b3f7a69d7d4b48ecdf1b30d5c2d 100644 (file)
--- a/src/imap-login/imap-login-settings.c
+++ b/src/imap-login/imap-login-settings.c
@@ -10,6 +10,16 @@
 #include <stddef.h>
 
 /* <settings checks> */
+static struct file_listener_settings imap_login_unix_listeners_array[] = {
+       { "srv.imap-login/%{pid}", 0600, "", "" },
+};
+static struct file_listener_settings *imap_login_unix_listeners[] = {
+       &imap_login_unix_listeners_array[0],
+};
+static buffer_t imap_login_unix_listeners_buf = {
+       { { imap_login_unix_listeners, sizeof(imap_login_unix_listeners) } }
+};
+
 static struct inet_listener_settings imap_login_inet_listeners_array[] = {
        { .name = "imap", .address = "", .port = 143 },
        { .name = "imaps", .address = "", .port = 993, .ssl = TRUE }
@@ -43,7 +53,8 @@ struct service_settings imap_login_service_settings = {
        .idle_kill = 0,
        .vsz_limit = UOFF_T_MAX,
 
-       .unix_listeners = ARRAY_INIT,
+       .unix_listeners = { { &imap_login_unix_listeners_buf,
+                             sizeof(imap_login_unix_listeners[0]) } },
        .fifo_listeners = ARRAY_INIT,
        .inet_listeners = { { &imap_login_inet_listeners_buf,
                              sizeof(imap_login_inet_listeners[0]) } }

diff --git a/src/pop3-login/pop3-login-settings.c b/src/pop3-login/pop3-login-settings.c
index e81532590c0c5911cd3f2a7317f34322b7a44a55..91fbbee08fdd430792527a0f851a8baf056ef5dc 100644 (file)
--- a/src/pop3-login/pop3-login-settings.c
+++ b/src/pop3-login/pop3-login-settings.c
@@ -11,6 +11,16 @@
 #include <stddef.h>
 
 /* <settings checks> */
+static struct file_listener_settings pop3_login_unix_listeners_array[] = {
+       { "srv.pop3-login/%{pid}", 0600, "", "" },
+};
+static struct file_listener_settings *pop3_login_unix_listeners[] = {
+       &pop3_login_unix_listeners_array[0],
+};
+static buffer_t pop3_login_unix_listeners_buf = {
+       { { pop3_login_unix_listeners, sizeof(pop3_login_unix_listeners) } }
+};
+
 static struct inet_listener_settings pop3_login_inet_listeners_array[] = {
        { .name = "pop3", .address = "", .port = POP3_DEFAULT_PORT },
        { .name = "pop3s", .address = "", .port = POP3S_DEFAULT_PORT,
@@ -45,7 +55,8 @@ struct service_settings pop3_login_service_settings = {
        .idle_kill = 0,
        .vsz_limit = UOFF_T_MAX,
 
-       .unix_listeners = ARRAY_INIT,
+       .unix_listeners = { { &pop3_login_unix_listeners_buf,
+                             sizeof(pop3_login_unix_listeners[0]) } },
        .fifo_listeners = ARRAY_INIT,
        .inet_listeners = { { &pop3_login_inet_listeners_buf,
                              sizeof(pop3_login_inet_listeners[0]) } }

diff --git a/src/submission-login/submission-login-settings.c b/src/submission-login/submission-login-settings.c
index 316748f1f18e379b552f2313252fd4024b188cbc..d5384d2bc6fc7579ecbdd2738ed493a68ff5b35f 100644 (file)
--- a/src/submission-login/submission-login-settings.c
+++ b/src/submission-login/submission-login-settings.c
@@ -14,6 +14,17 @@ static bool
 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, "", "" },
+};
+static struct file_listener_settings *submission_login_unix_listeners[] = {
+       &submission_login_unix_listeners_array[0],
+};
+static buffer_t submission_login_unix_listeners_buf = {
+       { { submission_login_unix_listeners,
+           sizeof(submission_login_unix_listeners) } }
+};
+
 static struct inet_listener_settings submission_login_inet_listeners_array[] = {
        { .name = "submission", .address = "", .port = 587  },
        { .name = "submissions", .address = "", .port = 465, .ssl = TRUE }
@@ -47,7 +58,8 @@ struct service_settings submission_login_service_settings = {
        .idle_kill = 0,
        .vsz_limit = UOFF_T_MAX,
 
-       .unix_listeners = ARRAY_INIT,
+       .unix_listeners = { { &submission_login_unix_listeners_buf,
+                             sizeof(submission_login_unix_listeners[0]) } },
        .fifo_listeners = ARRAY_INIT,
        .inet_listeners = { { &submission_login_inet_listeners_buf,
                              sizeof(submission_login_inet_listeners[0]) } }