diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-06-04 19:24:54 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-06-04 19:24:54 +0300 |
| commit | bb86001cb89791d23fc2c728b7253182ec6149fe (patch) | |
| tree | c2769083fbd6d9490f8b1a2899f822c4f1c4b5c6 /pies | |
| parent | 9b285abfa3c46d7b751ce11bac5348a9e961c407 (diff) | |
| download | pies-bb86001cb89791d23fc2c728b7253182ec6149fe.tar.gz pies-bb86001cb89791d23fc2c728b7253182ec6149fe.tar.bz2 | |
MeTA1-related improvements.
* configure.ac: Check for pmilter_S.pmfi_thrmax_[sh]. Requires
28/0009-pmilter-configurable-maxthr.diff.
* pmult/pmult.c: New configuration statements: max-threads-soft
and max-threads-hard.
* pies/pies.c (_cm_include_meta1): Fix coredump on syntax errors
in meta1.conf.
Diffstat (limited to 'pies')
| -rw-r--r-- | pies/pies.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pies/pies.c b/pies/pies.c index 6daf6b0..de46cac 100644 --- a/pies/pies.c +++ b/pies/pies.c @@ -880,13 +880,15 @@ _cm_include_meta1 (mu_debug_t debug, void *data, mu_config_value_t *arg) if (mu_cfg_assert_value_type (arg, MU_CFG_STRING, debug)) return 1; - meta1_config_parse (arg->v.string); - if (mu_cfg_parser_verbose) - flags |= MU_PARSE_CONFIG_VERBOSE; - if (mu_cfg_parser_verbose > 1) - flags |= MU_PARSE_CONFIG_DUMP; - mu_cfg_tree_reduce (meta1_parse_tree, mu_program_name, pies_cfg_param, - flags, NULL); + if (meta1_config_parse (arg->v.string) == 0) + { + if (mu_cfg_parser_verbose) + flags |= MU_PARSE_CONFIG_VERBOSE; + if (mu_cfg_parser_verbose > 1) + flags |= MU_PARSE_CONFIG_DUMP; + mu_cfg_tree_reduce (meta1_parse_tree, mu_program_name, pies_cfg_param, + flags, NULL); + } return 0; } |