Mercurial > dovecot > core-2.2
changeset 22593:7bb07a5745d4
pop3: Expand settings to fix rawlog_dir
Even if %variables weren't used in rawlog_dir, the path was always prefixed
with "0".
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Fri, 06 Oct 2017 14:39:00 +0300 |
| parents | 8dc7e629897a |
| children | ec7c7ceca87b |
| files | src/pop3/main.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pop3/main.c Fri Oct 06 12:47:06 2017 +0300 +++ b/src/pop3/main.c Fri Oct 06 14:39:00 2017 +0300 @@ -10,6 +10,7 @@ #include "str.h" #include "process-title.h" #include "restrict-access.h" +#include "settings-parser.h" #include "master-service.h" #include "master-login.h" #include "master-interface.h" @@ -102,7 +103,7 @@ "-ERR [SYS/TEMP] "MAIL_ERRSTR_CRITICAL_MSG"\r\n"; struct mail_storage_service_user *user; struct mail_user *mail_user; - const struct pop3_settings *set; + struct pop3_settings *set; if (mail_storage_service_lookup_next(storage_service, input, &user, &mail_user, error_r) <= 0) { @@ -117,6 +118,9 @@ if (set->verbose_proctitle) verbose_proctitle = TRUE; + settings_var_expand(&pop3_setting_parser_info, set, + mail_user->pool, mail_user_var_expand_table(mail_user)); + *client_r = client_create(fd_in, fd_out, input->session_id, mail_user, user, set);