github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

API CHANGE: Rules::merge signature was change to includes error msg

Browse Source
This commit is contained in:
Felipe Zimmerle 2017-03-23 09:52:39 -03:00
parent 5e59d19121
commit dbcf5a7198
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/modsecurity/rules.h
View File

@ -99,7 +99,7 @@ extern "C" {
Rules *msc_create_rules_set(); Rules *msc_create_rules_set();
void msc_rules_dump(Rules *rules); void msc_rules_dump(Rules *rules);
int msc_rules_merge(Rules *rules_dst, Rules *rules_from); int msc_rules_merge(Rules *rules_dst, Rules *rules_from, const char **error);
int msc_rules_add_remote(Rules *rules, const char *key, const char *uri, int msc_rules_add_remote(Rules *rules, const char *key, const char *uri,
const char **error); const char **error);
int msc_rules_add_file(Rules *rules, const char *file, const char **error); int msc_rules_add_file(Rules *rules, const char *file, const char **error);

8
src/rules.cc
View File

@ -277,8 +277,12 @@ extern "C" void msc_rules_dump(Rules *rules) {
extern "C" int msc_rules_merge(Rules *rules_dst, extern "C" int msc_rules_merge(Rules *rules_dst,
Rules *rules_from) { Rules *rules_from, const char **error) {
return rules_dst->merge(rules_from); int ret = rules_dst->merge(rules_from);
if (ret < 0) {
*error = strdup(rules_dst->getParserError().c_str());
}
return ret;
} }