github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-15 17:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3265 from rainerjung/v2/move-id_log-to-msc_util

Browse Source 
Move id_log() to msc_util to fix unit tests; it is declared on msc_ut…
This commit is contained in:
Marc Stern
2024-10-02 13:00:00 +02:00
committed by GitHub
parent 02ca247283 149376377e
commit d6f1ebb4a3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apache2/apache2_config.c
View File

@@ -30,16 +30,6 @@
APLOG_USE_MODULE(security2);
#endif
// Returns the rule id if existing, otherwise the file name & line number
const char* id_log(msre_rule* rule) {
assert(rule != NULL);
assert(rule->actionset != NULL);
assert(rule->ruleset != NULL);
const char* id = rule->actionset->id;
if (!id || id == NOT_SET_P || !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);
return id;
}
/* -- Directory context creation and initialisation -- */
/**

10
apache2/msc_util.c
View File

@@ -2849,3 +2849,13 @@ char* get_username(apr_pool_t* mp) {
if (rc != APR_SUCCESS) return "apache";
return username;
}
// Returns the rule id if existing, otherwise the file name & line number
const char* id_log(msre_rule* rule) {
assert(rule != NULL);
assert(rule->actionset != NULL);
assert(rule->ruleset != NULL);
const char* id = rule->actionset->id;
if (!id || id == NOT_SET_P || !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);
return id;
}