From 15893e312b390550a823a4e31d7577e0bd896c16 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Tue, 25 Aug 2015 07:31:27 -0300 Subject: [PATCH] Fix regression test and example: checking if rules are loaded ok It was checking only the amount of rules loaded, which could be 0 if only configuration directives are loaded. --- examples/simple_example_using_c/test.c | 4 ++-- test/regression/regression.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/simple_example_using_c/test.c b/examples/simple_example_using_c/test.c index 4f9c5e8f..19dad72e 100644 --- a/examples/simple_example_using_c/test.c +++ b/examples/simple_example_using_c/test.c @@ -38,7 +38,7 @@ int main (int argc, char **argv) rules = msc_create_rules_set(); ret = msc_rules_add_file(rules, main_rule_uri, &error); - if (ret == 0) { + if (ret < 0) { fprintf(stderr, "Problems loading the rules --\n"); fprintf(stderr, "%s\n", error); goto end; @@ -48,7 +48,7 @@ int main (int argc, char **argv) ret = msc_rules_add_remote(rules, "test", "https://www.modsecurity.org/modsecurity-regression-test-secremoterules.txt", &error); - if (ret == 0) { + if (ret < 0) { fprintf(stderr, "Problems loading the rules --\n"); fprintf(stderr, "%s\n", error); goto end; diff --git a/test/regression/regression.cc b/test/regression/regression.cc index 9b4532eb..dc9409a8 100644 --- a/test/regression/regression.cc +++ b/test/regression/regression.cc @@ -97,7 +97,7 @@ void perform_unit_test(std::vector *tests, " (ModSecurity regression test utility)"); modsec_rules = new ModSecurity::Rules(debug_log); - if (modsec_rules->load(t->rules.c_str(), filename) == false) { + if (modsec_rules->load(t->rules.c_str(), filename) < 0) { if (t->parser_error.empty() == true) { std::cerr << "parse failed." << std::endl; std::cout << modsec_rules->getParserError() << std::endl;