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

Move id_log() to msc_util to fix unit tests; it is declared on msc_ut…

Author: Marc Stern

apache2/apache2_config.c

@@ -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 -- */
 
 /**

apache2/msc_util.c

@@ -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;
+}