lib-master, global: Rename master_service_settings_get_flags to settings_get_flags

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index ffa612a07ccac0d5923ecf039c31605670072eb9..a9d55d3c597975243169adbcc98e3c3301a0db66 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -1023,8 +1023,8 @@ get_default_replica_location(struct dsync_cmd_context *ctx,
        if (master_service_settings_get(
                        mail_storage_service_user_get_event(service_user),
                        &mail_storage_setting_parser_info,
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_CHECK |
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
+                       SETTINGS_GET_FLAG_NO_CHECK |
+                       SETTINGS_GET_FLAG_NO_EXPAND,
                        &mail_set, error_r) < 0)
                return -1;
        ctx->local_location = p_strdup(ctx->ctx.pool,

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index f46eccf77eea5c1eb4547c798d0a4c539dd00af6..ee083c5cfa3d0e87b6b599dd7100b3127682950b 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -1226,7 +1226,7 @@ settings_instance_get(struct event *event,
                      struct settings_root *root,
                      struct settings_instance *instance,
                      const struct setting_parser_info *info,
-                     enum master_service_settings_get_flags flags,
+                     enum settings_get_flags flags,
                      const char *source_filename,
                      unsigned int source_linenum,
                      const void **set_r, const char **error_r)
@@ -1284,7 +1284,7 @@ settings_instance_get(struct event *event,
        /* settings are now referenced, but the parser is no longer needed */
        settings_parser_unref(&parser);
 
-       if ((flags & MASTER_SERVICE_SETTINGS_GET_FLAG_NO_CHECK) == 0) {
+       if ((flags & SETTINGS_GET_FLAG_NO_CHECK) == 0) {
                if (!settings_check(info, *pool_p, set, error_r)) {
                        *error_r = t_strdup_printf("Invalid %s settings: %s",
                                                   info->name, *error_r);
@@ -1294,7 +1294,7 @@ settings_instance_get(struct event *event,
                }
        }
 
-       if ((flags & MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND) != 0)
+       if ((flags & SETTINGS_GET_FLAG_NO_EXPAND) != 0)
                ret = 1;
        else T_BEGIN {
                const struct var_expand_table *tab;
@@ -1324,7 +1324,7 @@ settings_instance_get(struct event *event,
 #undef master_service_settings_get
 int master_service_settings_get(struct event *event,
                                const struct setting_parser_info *info,
-                               enum master_service_settings_get_flags flags,
+                               enum settings_get_flags flags,
                                const char *source_filename,
                                unsigned int source_linenum,
                                const void **set_r, const char **error_r)

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index defb924b5e377fd41297a21550cf884ac4dc47ff..7320a7635c58378720e133e243ca52c278a93752 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -22,11 +22,11 @@ enum settings_override_type {
        SETTINGS_OVERRIDE_TYPE_COUNT,
 };
 
-enum master_service_settings_get_flags {
+enum settings_get_flags {
        /* Don't call check_func()s */
-       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_CHECK = BIT(0),
+       SETTINGS_GET_FLAG_NO_CHECK = BIT(0),
        /* Don't expand %variables in settings */
-       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND = BIT(1),
+       SETTINGS_GET_FLAG_NO_EXPAND = BIT(1),
 };
 
 struct master_service_settings {
@@ -154,13 +154,13 @@ master_service_get_service_settings(struct master_service *service);
    macro can be used to do the freeing in a nice way.
 
    Settings have their %variables expanded, unless
-   MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND is used. The event and its
+   SETTINGS_GET_FLAG_NO_EXPAND is used. The event and its
    parents are scanned for MASTER_SERVICE_VAR_EXPAND_* pointers. The first
    callback or tables that are found in the event hierarchy are used for the
    expansion. See MASTER_SERVICE_VAR_EXPAND_* macros for more details. */
 int master_service_settings_get(struct event *event,
                                const struct setting_parser_info *info,
-                               enum master_service_settings_get_flags flags,
+                               enum settings_get_flags flags,
                                const char *source_filename,
                                unsigned int source_linenum,
                                const void **set_r, const char **error_r);

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index da3a9eb6e8f03ffacefc4004d2b6c74ef707edd9..c4f59d98b809f145cd767a27e65a3b44fda2f1c0 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1454,7 +1454,7 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
        struct event *event = input == NULL ? NULL : input->event_parent;
        if (master_service_settings_get(event,
                        &mail_user_setting_parser_info,
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
+                       SETTINGS_GET_FLAG_NO_EXPAND,
                        &user_set, &error) < 0)
                i_fatal("%s", error);
 

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 858542d31f18340e3cf8e37136cc3b5f88c8ffaa..2dc6e67bc995d75b1622be801199f505ec61b92e 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -445,7 +445,7 @@ lmtp_local_deliver(struct lmtp_local *local,
        if (master_service_settings_get(
                        mail_storage_service_user_get_event(service_user),
                        &mail_storage_setting_parser_info,
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
+                       SETTINGS_GET_FLAG_NO_EXPAND,
                        &mail_set, &error) < 0) {
                e_error(rcpt->event, "%s", error);
                smtp_server_recipient_reply(rcpt, 451, "4.3.0",

diff --git a/src/login-common/main.c b/src/login-common/main.c
index c37f3f565c11760419b7dc953e632cfa2340a995..51691e0dc784dfa2162898ae351a9460472fc0de 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -506,7 +506,7 @@ int login_binary_run(struct login_binary *binary,
        if (master_service_settings_read(master_service, &input,
                                         &output, &error) < 0 ||
            master_service_settings_get(NULL, &login_setting_parser_info,
-                                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
+                                       SETTINGS_GET_FLAG_NO_EXPAND,
                                        &global_login_settings, &error) < 0)
                i_fatal("%s", error);
        global_ssl_settings = master_service_settings_get_or_fatal(NULL,

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index ce309cee6dde64df5270a67075484770bf99ddbe..a7d456770eab1154c346ed099d68344c050848cc 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -307,7 +307,7 @@ static void main_init(void)
 
        if (master_service_settings_get(NULL,
                        &mail_storage_setting_parser_info,
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
+                       SETTINGS_GET_FLAG_NO_EXPAND,
                        &mail_set, &error) < 0)
                i_fatal("%s", error);
        quota_status_settings = master_service_settings_get_or_fatal(NULL,