From 066b79abe9943821240ccc3a458e8ba45b9ee9e8 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 18 Oct 2017 17:04:44 +0200 Subject: `.pos` is mutuaally exclusive with .param and .paran_r --- src/sp_config_keywords.c | 4 ++-- src/tests/broken_conf_mutually_exclusive4.phpt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index b03c28e..097d08b 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c @@ -204,10 +204,10 @@ int parse_disabled_functions(char *line) { "'.r_filename' and '.filename' are mutually exclusive on line %zu.", line, sp_line_no); return -1; - } else if (df->r_param && df->param) { + } else if (1 < ((df->r_param?1:0) + (df->param?1:0) + ((-1 != df->pos)?1:0))) { sp_log_err("config", "Invalid configuration line: 'sp.disabled_functions%s':" - "'.r_param' and '.param' are mutually exclusive on line %zu.", + "'.r_param', '.param' and '.pos' are mutually exclusive on line %zu.", line, sp_line_no); return -1; } else if (df->r_ret && df->ret) { diff --git a/src/tests/broken_conf_mutually_exclusive4.phpt b/src/tests/broken_conf_mutually_exclusive4.phpt index 4e888f5..a60f3fa 100644 --- a/src/tests/broken_conf_mutually_exclusive4.phpt +++ b/src/tests/broken_conf_mutually_exclusive4.phpt @@ -6,4 +6,4 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive4.ini --FILE-- --EXPECT-- -[snuffleupagus][0.0.0.0][config][error] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param' and '.param' are mutually exclusive on line 1. \ No newline at end of file +[snuffleupagus][0.0.0.0][config][error] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param', '.param' and '.pos' are mutually exclusive on line 1. -- cgit v1.3