global: Flip MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT to ..._ALLOW_ROOT

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index 07a0a08b980a911d24e43705179b53d49ee78604..5c50d770fbbf744abcaea32b41d8c98349d87962 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -970,8 +970,6 @@ int main(int argc, char *argv[])
                        MASTER_SERVICE_FLAG_STD_CLIENT;
        } else {
                service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
-               storage_service_flags |=
-                       MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
        }
 
        master_service = master_service_init("imap-urlauth-worker", service_flags,

diff --git a/src/imap/main.c b/src/imap/main.c
index c6170bd2ebdffa383b83412fae89009fe0048108..efd413381d6772a2ea42e05e3328d875772f02a5 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -449,7 +449,6 @@ int main(int argc, char *argv[])
        } else {
                service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
                storage_service_flags |=
-                       MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT |
                        MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES;
 
                /*

diff --git a/src/indexer/indexer-worker.c b/src/indexer/indexer-worker.c
index 32ee9d8cdce354aa17ce2567d47d819d49d77750..50645b761e95cda7776739f16facb38a14a544e4 100644 (file)
--- a/src/indexer/indexer-worker.c
+++ b/src/indexer/indexer-worker.c
@@ -49,7 +49,6 @@ int main(int argc, char *argv[])
                MASTER_SERVICE_FLAG_SEND_STATS |
                MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
        enum mail_storage_service_flags storage_service_flags =
-               MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT |
                MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |
                MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP |
                MAIL_STORAGE_SERVICE_FLAG_NO_IDLE_TIMEOUT;

diff --git a/src/lda/main.c b/src/lda/main.c
index 80b11142300395db52d481c0bda981075c9665cf..998bfdd35ec6873bf14f378b389a28e53e8341c0 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -411,8 +411,7 @@ int main(int argc, char *argv[])
        service_input.service = "lda";
        service_input.username = user;
 
-       service_flags |= MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT |
-               MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS;
+       service_flags |= MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS;
        storage_service = mail_storage_service_init(master_service, set_roots,
                                                    service_flags);
        mail_deliver_hooks_init();

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 11a45c2d8fc2ff5942144dabd549b6a29fff075f..0a27b745b90165321c1da1e97647ebc86d9a0dec 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1467,7 +1467,7 @@ mail_storage_service_next_real(struct mail_storage_service_ctx *ctx,
        const char *error;
        size_t len;
        bool allow_root =
-               (user->flags & MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT) == 0;
+               (user->flags & MAIL_STORAGE_SERVICE_FLAG_ALLOW_ROOT) != 0;
        bool temp_priv_drop =
                (user->flags & MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP) != 0;
        bool use_chroot;

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index fe4960773766ae570d81444b46a7f12824f520ef..8861d6839e802a83324fb4c906b9860c6d905827 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -10,8 +10,8 @@ struct setting_parser_info;
 struct mail_storage_service_user;
 
 enum mail_storage_service_flags {
-       /* Fail if we don't drop root privileges */
-       MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT         = 0x01,
+       /* Allow not dropping root privileges */
+       MAIL_STORAGE_SERVICE_FLAG_ALLOW_ROOT            = 0x01,
        /* Lookup user from userdb */
        MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP         = 0x02,
        /* Force mail_debug=yes */

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index b73a5e290abc8540ad1f61a1d643b8a26e6777d7..f9800fbe4ec7462b3c38980b266828a31f37b915 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -113,7 +113,6 @@ int main(int argc, char *argv[])
                MASTER_SERVICE_FLAG_SEND_STATS |
                MASTER_SERVICE_FLAG_USE_SSL_SETTINGS;
        enum mail_storage_service_flags storage_service_flags =
-               MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT |
                MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |
                MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP |
                MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 431a980e67f6d30e3d38dff309cb046e124cbf95..0b58c1764503e61a3e85ee093fd1fa92199ddabf 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -224,6 +224,7 @@ static void main_init(void)
 
        clients = connection_list_init(&client_set, &client_vfuncs);
        storage_service = mail_storage_service_init(master_service, set_roots,
+               MAIL_STORAGE_SERVICE_FLAG_ALLOW_ROOT |
                MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |
                MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP |
                MAIL_STORAGE_SERVICE_FLAG_ENABLE_CORE_DUMPS |

diff --git a/src/pop3/main.c b/src/pop3/main.c
index bb1a248d69b473b28e5c2d0d2337acf343aebdf0..85916c3cb7d7497280e581ab41f7a1d86a063959 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -338,8 +338,6 @@ int main(int argc, char *argv[])
                        MASTER_SERVICE_FLAG_STD_CLIENT;
        } else {
                service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
-               storage_service_flags |=
-                       MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
        }
 
        /*

diff --git a/src/submission/main.c b/src/submission/main.c
index b1488214e2e06c46eb998cff535ccdb2c1dd0e38..605fc8caa6f44fbf8e325e9daffbf1a615df43fb 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -285,8 +285,6 @@ int main(int argc, char *argv[])
                        MASTER_SERVICE_FLAG_STD_CLIENT;
        } else {
                service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
-               storage_service_flags |=
-                       MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
        }
 
        master_service = master_service_init("submission", service_flags,

diff --git a/src/util/script-login.c b/src/util/script-login.c
index 0954b47c50246068ba219d0d17fbece364a87961..2213edf893e7327d79b260e470bfcf6c70ac0c65 100644 (file)
--- a/src/util/script-login.c
+++ b/src/util/script-login.c
@@ -26,6 +26,7 @@ static bool drop_to_userdb_privileges = FALSE;
 static void client_connected(struct master_service_connection *conn)
 {
        enum mail_storage_service_flags flags =
+               MAIL_STORAGE_SERVICE_FLAG_ALLOW_ROOT |
                MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS;
        string_t *instr, *keys;
        const char *const *args, *key, *value, *error, *version_line, *data_line;