dovecot-2.2: lib-master: i_close_fd() change caused environment ...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Jul 4 11:19:55 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/5d3bc8a98e46
changeset: 14705:5d3bc8a98e46
user: Timo Sirainen <tss at iki.fi>
date: Wed Jul 04 11:19:44 2012 +0300
description:
lib-master: i_close_fd() change caused environment variables to be used as settings.
diffstat:
src/lib-master/master-service-settings.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (25 lines):
diff -r 04c89bb18bdd -r 5d3bc8a98e46 src/lib-master/master-service-settings.c
--- a/src/lib-master/master-service-settings.c Mon Jul 02 05:14:22 2012 +0300
+++ b/src/lib-master/master-service-settings.c Wed Jul 04 11:19:44 2012 +0300
@@ -337,6 +337,7 @@
unsigned int i;
int ret, fd = -1;
time_t now, timeout;
+ bool use_environment;
memset(output_r, 0, sizeof(*output_r));
@@ -415,9 +416,12 @@
service->config_fd = fd;
else
i_close_fd(&fd);
+ use_environment = FALSE;
+ } else {
+ use_environment = TRUE;
}
- if (fd == -1 || service->keep_environment) {
+ if (use_environment || service->keep_environment) {
if (settings_parse_environ(parser) < 0) {
*error_r = settings_parser_get_error(parser);
return -1;
More information about the dovecot-cvs
mailing list