lmtp: Rename unexpanded_lda_set to lda_set

Also expand them, although there are currently no STR_VARS settings to be
expanded.

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index 1f8b4a1fbe20c5626a01193788a8675597f8451a..978fdf67590ed27e0ee1051743ba6c83c8a33c0c 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -126,9 +126,8 @@ static void client_read_settings(struct client *client, bool ssl)
        struct event *event = event_create(client->event);
        event_set_ptr(event, MASTER_SERVICE_VAR_EXPAND_TABLE, (void *)tab);
        if (master_service_settings_parser_get(event, set_parser,
-                       &lda_setting_parser_info,
-                       MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
-                       &client->unexpanded_lda_set, &error) < 0 ||
+                       &lda_setting_parser_info, 0,
+                       &client->lda_set, &error) < 0 ||
            master_service_settings_parser_get(event, set_parser,
                        &lmtp_setting_parser_info, 0,
                        &client->lmtp_set, &error) < 0)
@@ -168,8 +167,7 @@ struct client *client_create(int fd_in, int fd_out,
 
        client_read_settings(client, conn_tls);
        client_load_modules(client);
-       client->my_domain = p_strdup(client->pool,
-                                    client->unexpanded_lda_set->hostname);
+       client->my_domain = p_strdup(client->pool, client->lda_set->hostname);
 
        if (master_service_get_service_settings(master_service)->verbose_proctitle)
                verbose_proctitle = TRUE;
@@ -186,7 +184,7 @@ struct client *client_create(int fd_in, int fd_out,
                SMTP_CAPABILITY__ORCPT;
        if (!conn_tls && master_service_ssl_is_enabled(master_service))
                lmtp_set.capabilities |= SMTP_CAPABILITY_STARTTLS;
-       lmtp_set.hostname = client->unexpanded_lda_set->hostname;
+       lmtp_set.hostname = client->lda_set->hostname;
        lmtp_set.login_greeting = client->lmtp_set->login_greeting;
        lmtp_set.max_message_size = UOFF_T_MAX;
        lmtp_set.rcpt_param_extensions = rcpt_param_extensions;
@@ -269,7 +267,7 @@ client_default_destroy(struct client *client)
 
        client_state_reset(client);
 
-       master_service_settings_free(client->unexpanded_lda_set);
+       master_service_settings_free(client->lda_set);
        master_service_settings_free(client->lmtp_set);
        event_unref(&client->event);
        pool_unref(&client->state_pool);

diff --git a/src/lmtp/lmtp-client.h b/src/lmtp/lmtp-client.h
index 01dedcdae05a2a08f003896bfa794848e9fe787a..9373f7b4b7fb4426c09f155973127033936fc6f9 100644 (file)
--- a/src/lmtp/lmtp-client.h
+++ b/src/lmtp/lmtp-client.h
@@ -72,7 +72,7 @@ struct client {
        struct lmtp_client_vfuncs v;
        struct event *event;
 
-       const struct lda_settings *unexpanded_lda_set;
+       const struct lda_settings *lda_set;
        const struct lmtp_settings *lmtp_set;
 
        struct smtp_server_connection *conn;

diff --git a/src/lmtp/lmtp-recipient.c b/src/lmtp/lmtp-recipient.c
index f996a967244b65713c4b8d28efc8fb249d4d500c..5c718567495eea5dfc71b87e267c7a8e1395267d 100644 (file)
--- a/src/lmtp/lmtp-recipient.c
+++ b/src/lmtp/lmtp-recipient.c
@@ -24,8 +24,7 @@ lmtp_recipient_create(struct client *client,
        lrcpt->rcpt = rcpt;
        lrcpt->client = client;
 
-       smtp_address_detail_parse_temp(
-               client->unexpanded_lda_set->recipient_delimiter,
+       smtp_address_detail_parse_temp(client->lda_set->recipient_delimiter,
                rcpt->path, &username, &delim, &detail);
        i_assert(*username != '\0');