diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-10-02 20:23:16 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-10-02 20:23:16 +0400 |
| commit | ce482fbf8e2c1b9bf0cdba0ab61bc26985ee8977 (patch) | |
| tree | aa9db8b8c40ce43d504750f03f781652c16ea727 /src/cfg_file.y | |
| parent | f3ad9c6f1e91c9912dbe730fdec350b5fc908672 (diff) | |
| download | rspamd-ce482fbf8e2c1b9bf0cdba0ab61bc26985ee8977.tar.gz rspamd-ce482fbf8e2c1b9bf0cdba0ab61bc26985ee8977.zip | |
* Add reject score setting for hard rejecting of mail (by Anton Nekhoroshin)
* Add rspamc protocol 1.1 (3 marks instead of 2)
Diffstat (limited to 'src/cfg_file.y')
| -rw-r--r-- | src/cfg_file.y | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/cfg_file.y b/src/cfg_file.y index 7d9316b60..85dcb9df5 100644 --- a/src/cfg_file.y +++ b/src/cfg_file.y @@ -52,7 +52,7 @@ struct rspamd_view *cur_view = NULL; %token MEMCACHED WORKER TYPE MODULES MODULE_PATH %token MODULE_OPT PARAM VARIABLE %token FILTERS FACTORS METRIC NAME CACHE_FILE -%token REQUIRED_SCORE FUNCTION FRACT COMPOSITES CONTROL PASSWORD +%token REQUIRED_SCORE REJECT_SCORE FUNCTION FRACT COMPOSITES CONTROL PASSWORD %token LOGGING LOG_TYPE LOG_TYPE_CONSOLE LOG_TYPE_SYSLOG LOG_TYPE_FILE %token LOG_LEVEL LOG_LEVEL_DEBUG LOG_LEVEL_INFO LOG_LEVEL_WARNING LOG_LEVEL_ERROR LOG_FACILITY LOG_FILENAME %token STATFILE ALIAS PATTERN WEIGHT STATFILE_POOL_SIZE SIZE TOKENIZER CLASSIFIER @@ -365,6 +365,7 @@ metriccmd: | metricname | metricfunction | metricscore + | metricrjscore | metricclassifier | metriccache ; @@ -409,6 +410,21 @@ metricscore: } ; +metricrjscore: + REJECT_SCORE EQSIGN NUMBER { + if (cur_metric == NULL) { + cur_metric = memory_pool_alloc0 (cfg->cfg_pool, sizeof (struct metric)); + } + cur_metric->reject_score = $3; + } + | REQUIRED_SCORE EQSIGN FRACT { + if (cur_metric == NULL) { + cur_metric = memory_pool_alloc0 (cfg->cfg_pool, sizeof (struct metric)); + } + cur_metric->reject_score = $3; + } + ; + metricclassifier: CLASSIFIER EQSIGN QUOTEDSTRING { if (cur_metric == NULL) { |