doveadm-settings.c (dovecot-2.3.16) | : | doveadm-settings.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 215 | skipping to change at line 215 | |||
if (dsync_settings_parse_features(set, error_r) != 0) | if (dsync_settings_parse_features(set, error_r) != 0) | |||
return FALSE; | return FALSE; | |||
return TRUE; | return TRUE; | |||
} | } | |||
/* </settings checks> */ | /* </settings checks> */ | |||
const struct master_service_ssl_settings *doveadm_ssl_set = NULL; | const struct master_service_ssl_settings *doveadm_ssl_set = NULL; | |||
void doveadm_get_ssl_settings(struct ssl_iostream_settings *set_r, pool_t pool) | void doveadm_get_ssl_settings(struct ssl_iostream_settings *set_r, pool_t pool) | |||
{ | { | |||
i_zero(set_r); | master_service_ssl_client_settings_to_iostream_set(doveadm_ssl_set, | |||
master_service_ssl_settings_to_iostream_set(doveadm_ssl_set, pool, | pool, set_r); | |||
MASTER_SERVICE_SSL_SETTINGS_T | ||||
YPE_CLIENT, | ||||
set_r); | ||||
} | } | |||
void doveadm_settings_expand(struct doveadm_settings *set, pool_t pool) | void doveadm_settings_expand(struct doveadm_settings *set, pool_t pool) | |||
{ | { | |||
struct var_expand_table tab[] = { { '\0', NULL, NULL } }; | struct var_expand_table tab[] = { { '\0', NULL, NULL } }; | |||
const char *error; | const char *error; | |||
if (settings_var_expand(&doveadm_setting_parser_info, set, | if (settings_var_expand(&doveadm_setting_parser_info, set, | |||
pool, tab, &error) <= 0) | pool, tab, &error) <= 0) | |||
i_fatal("Failed to expand settings: %s", error); | i_fatal("Failed to expand settings: %s", error); | |||
End of changes. 1 change blocks. | ||||
5 lines changed or deleted | 2 lines changed or added |