global: Replace built-in $default_* variables with $SET:default_*

This way they're more consistent with how they can be used in config files.

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index ade37cf83752bbbaa2e5b63b74d34756f3c4ce18..3ff79fbacbf010f2a156b55842ddde72114da955 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -18,7 +18,7 @@ struct service_settings auth_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "auth",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",
@@ -41,12 +41,12 @@ const struct setting_keyvalue auth_service_settings_defaults[] = {
        { "unix_listener/auth-client/path", "auth-client" },
        { "unix_listener/auth-client/type", "auth" },
        { "unix_listener/auth-client/mode", "0600" },
-       { "unix_listener/auth-client/user", "$default_internal_user" },
+       { "unix_listener/auth-client/user", "$SET:default_internal_user" },
 
        { "unix_listener/auth-login/path", "auth-login" },
        { "unix_listener/auth-login/type", "login" },
        { "unix_listener/auth-login/mode", "0600" },
-       { "unix_listener/auth-login/user", "$default_internal_user" },
+       { "unix_listener/auth-login/user", "$SET:default_internal_user" },
 
        { "unix_listener/auth-master/path", "auth-master" },
        { "unix_listener/auth-master/type", "master" },
@@ -55,7 +55,7 @@ const struct setting_keyvalue auth_service_settings_defaults[] = {
        { "unix_listener/auth-userdb/path", "auth-userdb" },
        { "unix_listener/auth-userdb/type", "userdb" },
        { "unix_listener/auth-userdb/mode", "0666" },
-       { "unix_listener/auth-userdb/user", "$default_internal_user" },
+       { "unix_listener/auth-userdb/user", "$SET:default_internal_user" },
 
        { "unix_listener/login\\slogin/path", "login/login" },
        { "unix_listener/login\\slogin/type", "login" },
@@ -94,7 +94,7 @@ const struct setting_keyvalue auth_worker_service_settings_defaults[] = {
 
        { "unix_listener/auth-worker/path", "auth-worker" },
        { "unix_listener/auth-worker/mode", "0600" },
-       { "unix_listener/auth-worker/user", "$default_internal_user" },
+       { "unix_listener/auth-worker/user", "$SET:default_internal_user" },
 
        { NULL, NULL }
 };

diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c
index 897f31ef6fd6a454255acba1a49d544de7d9a180..475e6adf185467a85fedce717908b66b98f088bf 100644 (file)
--- a/src/dict/dict-settings.c
+++ b/src/dict/dict-settings.c
@@ -11,7 +11,7 @@ struct service_settings dict_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "dict",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",
@@ -31,7 +31,7 @@ const struct setting_keyvalue dict_service_settings_defaults[] = {
 
        { "unix_listener/dict/path", "dict" },
        { "unix_listener/dict/mode", "0660" },
-       { "unix_listener/dict/group", "$default_internal_group" },
+       { "unix_listener/dict/group", "$SET:default_internal_group" },
 
        { NULL, NULL }
 };
@@ -41,7 +41,7 @@ struct service_settings dict_async_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "dict",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",
@@ -59,7 +59,7 @@ const struct setting_keyvalue dict_async_service_settings_defaults[] = {
 
        { "unix_listener/dict-async/path", "dict-async" },
        { "unix_listener/dict-async/mode", "0660" },
-       { "unix_listener/dict-async/group", "$default_internal_group" },
+       { "unix_listener/dict-async/group", "$SET:default_internal_group" },
 
        { NULL, NULL }
 };
@@ -69,7 +69,7 @@ struct service_settings dict_expire_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "dict-expire",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/dns/dns-client-settings.c b/src/dns/dns-client-settings.c
index 0cd311dc6a35656c57497dc603a5c811b3f2ac1f..9b04eb7f6d6e02d4dcf836d854973d9f3110fd85 100644 (file)
--- a/src/dns/dns-client-settings.c
+++ b/src/dns/dns-client-settings.c
@@ -10,7 +10,7 @@ struct service_settings dns_client_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "dns-client",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 9484702d0d2b966eb37dec04936848b3a5d11dc4..3378a87036d2cd427ab5e578e19ac491a5df3dda 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -25,7 +25,7 @@ struct service_settings doveadm_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,

diff --git a/src/imap-hibernate/imap-hibernate-settings.c b/src/imap-hibernate/imap-hibernate-settings.c
index 6e7071733c7e85f27115049d235b9b40a418ff03..f8e91ec47d2b9591c335f5bf9311a1cfe7031c62 100644 (file)
--- a/src/imap-hibernate/imap-hibernate-settings.c
+++ b/src/imap-hibernate/imap-hibernate-settings.c
@@ -12,7 +12,7 @@ struct service_settings imap_hibernate_service_settings = {
        .protocol = "imap",
        .type = "",
        .executable = "imap-hibernate",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",
@@ -30,7 +30,7 @@ const struct setting_keyvalue imap_hibernate_service_settings_defaults[] = {
 
        { "unix_listener/imap-hibernate/path", "imap-hibernate" },
        { "unix_listener/imap-hibernate/mode", "0660" },
-       { "unix_listener/imap-hibernate/group", "$default_internal_group" },
+       { "unix_listener/imap-hibernate/group", "$SET:default_internal_group" },
 
        { "unix_listener/srv.imap-hibernate\\s%{pid}/path", "srv.imap-hibernate/%{pid}" },
        { "unix_listener/srv.imap-hibernate\\s%{pid}/type", "admin" },

diff --git a/src/imap-login/imap-login-settings.c b/src/imap-login/imap-login-settings.c
index c4c53909ab9d687d9d381a1e5c7821ecb577fe83..922a23ffea75f9ca8b28dd28d1217c318c06d3d3 100644 (file)
--- a/src/imap-login/imap-login-settings.c
+++ b/src/imap-login/imap-login-settings.c
@@ -12,7 +12,7 @@ struct service_settings imap_login_service_settings = {
        .protocol = "imap",
        .type = "login",
        .executable = "imap-login",
-       .user = "$default_login_user",
+       .user = "$SET:default_login_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/imap-urlauth-login/imap-urlauth-login-settings.c b/src/imap-urlauth-login/imap-urlauth-login-settings.c
index 10be716ef9930cf348ea464af6c22172c191614a..a03c504794fab80c8c1fdebe830646e9565c90a9 100644 (file)
--- a/src/imap-urlauth-login/imap-urlauth-login-settings.c
+++ b/src/imap-urlauth-login/imap-urlauth-login-settings.c
@@ -11,7 +11,7 @@ struct service_settings imap_urlauth_login_service_settings = {
        .protocol = "imap",
        .type = "login",
        .executable = "imap-urlauth-login",
-       .user = "$default_login_user",
+       .user = "$SET:default_login_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/imap-urlauth/imap-urlauth-settings.c b/src/imap-urlauth/imap-urlauth-settings.c
index 44ceef6a4710bd1ed04ed76767c4239167c1eea1..495578068782fa68a4fc44ec9da1c781633f06a5 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-settings.c
+++ b/src/imap-urlauth/imap-urlauth-settings.c
@@ -13,7 +13,7 @@ struct service_settings imap_urlauth_service_settings = {
        .protocol = "imap",
        .type = "",
        .executable = "imap-urlauth",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c
index 2b38a8324b5f26251627b3910fd244a9a0f3685f..e79ade02561d66f72d4b66cfb4de959690ff5cff 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker-settings.c
+++ b/src/imap-urlauth/imap-urlauth-worker-settings.c
@@ -18,7 +18,7 @@ struct service_settings imap_urlauth_worker_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,
@@ -37,7 +37,7 @@ const struct setting_keyvalue imap_urlauth_worker_service_settings_defaults[] =
 
        { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/path", IMAP_URLAUTH_WORKER_SOCKET },
        { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/mode", "0600" },
-       { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/user", "$default_internal_user" },
+       { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/user", "$SET:default_internal_user" },
 
        { NULL, NULL }
 };

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 547efac490ec5379a4a39520e566f42494910d41..17db4f7884c372d2c1c60e8d211c447934905e1b 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -18,7 +18,7 @@ struct service_settings imap_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,

diff --git a/src/indexer/indexer-settings.c b/src/indexer/indexer-settings.c
index 42605ccf5e300858930c7d9fd50b53f45e0ab7e4..026279ea5129a46680770e9c516903564e138cb9 100644 (file)
--- a/src/indexer/indexer-settings.c
+++ b/src/indexer/indexer-settings.c
@@ -10,7 +10,7 @@ struct service_settings indexer_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "indexer",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/indexer/indexer-worker-settings.c b/src/indexer/indexer-worker-settings.c
index e762f87619905ba2f6f31c166c3aabac39c53498..2e0cd085fc27d640288709d31e903eadd21aff87 100644 (file)
--- a/src/indexer/indexer-worker-settings.c
+++ b/src/indexer/indexer-worker-settings.c
@@ -13,7 +13,7 @@ struct service_settings indexer_worker_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,
@@ -31,7 +31,7 @@ const struct setting_keyvalue indexer_worker_service_settings_defaults[] = {
 
        { "unix_listener/indexer-worker/path", "indexer-worker" },
        { "unix_listener/indexer-worker/mode", "0600" },
-       { "unix_listener/indexer-worker/user", "$default_internal_user" },
+       { "unix_listener/indexer-worker/user", "$SET:default_internal_user" },
 
        { "unix_listener/srv.indexer-worker\\s%{pid}/path", "srv.indexer-worker/%{pid}" },
        { "unix_listener/srv.indexer-worker\\s%{pid}/type", "admin" },

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index 3b9919f654e5a187f06867dcc34d75a21fc87c49..98b17ffc02ac43d507b6f23d11ccb3bcdc26a329 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -23,7 +23,7 @@ struct service_settings lmtp_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index d7d24c7f372c5ca308f25f563d56098b5245c05c..af67e83b3b9d1aaeda6cbfff7a82a089619c05d1 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -256,10 +256,10 @@ expand_user(const char **user, enum service_user_default *default_r,
        /* $variable expansion is typically done by doveconf, but these
           variables can come from built-in settings, so we need to expand
           them here */
-       if (strcmp(*user, "$default_internal_user") == 0) {
+       if (strcmp(*user, "$SET:default_internal_user") == 0) {
                *user = set->default_internal_user;
                *default_r = SERVICE_USER_DEFAULT_INTERNAL;
-       } else if (strcmp(*user, "$default_login_user") == 0) {
+       } else if (strcmp(*user, "$SET:default_login_user") == 0) {
                *user = set->default_login_user;
                *default_r = SERVICE_USER_DEFAULT_LOGIN;
        } else {
@@ -273,7 +273,7 @@ expand_group(const char **group, const struct master_settings *set)
        /* $variable expansion is typically done by doveconf, but these
           variables can come from built-in settings, so we need to expand
           them here */
-       if (strcmp(*group, "$default_internal_group") == 0)
+       if (strcmp(*group, "$SET:default_internal_group") == 0)
                *group = set->default_internal_group;
 }
 

diff --git a/src/pop3-login/pop3-login-settings.c b/src/pop3-login/pop3-login-settings.c
index 7dbbebac71584e7fa913f7c79ab5028747aa0141..3374b45a685de6642139429547de67045f06d5cc 100644 (file)
--- a/src/pop3-login/pop3-login-settings.c
+++ b/src/pop3-login/pop3-login-settings.c
@@ -12,7 +12,7 @@ struct service_settings pop3_login_service_settings = {
        .protocol = "pop3",
        .type = "login",
        .executable = "pop3-login",
-       .user = "$default_login_user",
+       .user = "$SET:default_login_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 0a6f6f98a62136cf5a24dcbd5721b25f53ccfab3..114e618b293dd6a7e82c5f58dabad2464ff83259 100644 (file)
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -20,7 +20,7 @@ struct service_settings pop3_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,

diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c
index 205fdbb791218e01778f54be44245b01bf26c7ae..1847088f029226e6e592f7c3cfb6e8f2c9f150a5 100644 (file)
--- a/src/stats/stats-settings.c
+++ b/src/stats/stats-settings.c
@@ -23,7 +23,7 @@ struct service_settings stats_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "stats",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",
@@ -44,7 +44,7 @@ const struct setting_keyvalue stats_service_settings_defaults[] = {
        { "unix_listener/login\\sstats-writer/path", "login/stats-writer" },
        { "unix_listener/login\\sstats-writer/type", "writer" },
        { "unix_listener/login\\sstats-writer/mode", "0600" },
-       { "unix_listener/login\\sstats-writer/user", "$default_login_user" },
+       { "unix_listener/login\\sstats-writer/user", "$SET:default_login_user" },
 
        { "unix_listener/stats-reader/path", "stats-reader" },
        { "unix_listener/stats-reader/type", "reader" },
@@ -53,7 +53,7 @@ const struct setting_keyvalue stats_service_settings_defaults[] = {
        { "unix_listener/stats-writer/path", "stats-writer" },
        { "unix_listener/stats-writer/type", "writer" },
        { "unix_listener/stats-writer/mode", "0660" },
-       { "unix_listener/stats-writer/group", "$default_internal_group" },
+       { "unix_listener/stats-writer/group", "$SET:default_internal_group" },
 
        { NULL, NULL }
 };

diff --git a/src/submission-login/submission-login-settings.c b/src/submission-login/submission-login-settings.c
index 7a3b6fe8f68c693f75ce54aa8ebf3205c92f12a7..a21bcbd826ddec5a4e8a8c4a3abfb868c7791a53 100644 (file)
--- a/src/submission-login/submission-login-settings.c
+++ b/src/submission-login/submission-login-settings.c
@@ -16,7 +16,7 @@ struct service_settings submission_login_service_settings = {
        .protocol = "submission",
        .type = "login",
        .executable = "submission-login",
-       .user = "$default_login_user",
+       .user = "$SET:default_login_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",

diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index bf042d5d3e88df151a5e1cbdb44d9e44ed7c5d54..21d5be6ce535207be89f9a6704ba8038eafcc1c0 100644 (file)
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -21,7 +21,7 @@ struct service_settings submission_service_settings = {
        .user = "",
        .group = "",
        .privileged_group = "",
-       .extra_groups = "$default_internal_group",
+       .extra_groups = "$SET:default_internal_group",
        .chroot = "",
 
        .drop_priv_before_exec = FALSE,

diff --git a/src/util/health-check-settings.c b/src/util/health-check-settings.c
index bacfe8354318035949159569ff43a3f1c8670daf..d7e6dd58af05340b1a8866c3ad481414ff90b8d0 100644 (file)
--- a/src/util/health-check-settings.c
+++ b/src/util/health-check-settings.c
@@ -10,7 +10,7 @@ struct service_settings health_check_service_settings = {
        .protocol = "",
        .type = "",
        .executable = "script -p health-check.sh",
-       .user = "$default_internal_user",
+       .user = "$SET:default_internal_user",
        .group = "",
        .privileged_group = "",
        .extra_groups = "",