From 7ecd5a8ca528e7cf99f513c56be311b15a0bd988 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 15 Dec 2009 20:10:40 -0500 Subject: [PATCH] config: Don't fail if process_min_avail is set and process_limit is the default. --HG-- branch : HEAD --- src/master/master-settings.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/master/master-settings.c b/src/master/master-settings.c index 299a1d8e27..04baae8da8 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -305,7 +305,7 @@ master_settings_verify(void *_set, pool_t pool, const char **error_r) struct service_settings *const *services; const char *const *strings; ARRAY_TYPE(const_string) all_listeners; - unsigned int i, j, count; + unsigned int i, j, count, process_limit; if (set->last_valid_uid != 0 && set->first_valid_uid > set->last_valid_uid) { @@ -368,7 +368,10 @@ master_settings_verify(void *_set, pool_t pool, const char **error_r) "used with chroot", service->name); return FALSE; } - if (service->process_min_avail > service->process_limit) { + process_limit = service->process_limit; + if (process_limit == 0) + process_limit = set->default_process_limit; + if (service->process_min_avail > process_limit) { *error_r = t_strdup_printf("service(%s): " "process_min_avail is higher than process_limit", service->name); -- 2.47.3