Skip to content

Commit 046d3eb

Browse files
author
Marc Stern
committed
Fixed two error messages
1 parent d32c8f1 commit 046d3eb

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

apache2/re.c

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,8 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
333333
if (match == 1) {
334334
rc = msre_parse_targets(ruleset, p, rule->targets, &my_error_msg);
335335
if (rc < 0) {
336-
if (msr) {
337-
msr_log(msr, 9, "Error parsing rule targets to replace variable");
338-
}
339-
#if !defined(MSC_TEST)
340-
else {
341-
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to replace variable");
342-
}
343-
#endif
336+
if (my_error_msg) my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to replace variable: %s", my_error_msg);
337+
else my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to replace variable");
344338
goto end;
345339
}
346340
if (msr) {
@@ -354,14 +348,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
354348
var_appended = 1;
355349

356350
} else {
357-
if (msr) {
358-
msr_log(msr, 9, "Cannot find variable to replace");
359-
}
360-
#if !defined(MSC_TEST)
361-
else {
362-
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find variable to replace");
363-
}
364-
#endif
351+
my_error_msg = apr_psprintf(ruleset->mp, "Cannot find variable to replace");
365352
goto end;
366353
}
367354
}
@@ -445,14 +432,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
445432
if (match == 0 ) {
446433
rc = msre_parse_targets(ruleset, p, rule->targets, &my_error_msg);
447434
if (rc < 0) {
448-
if (msr) {
449-
msr_log(msr, 9, "Error parsing rule targets to append variable");
450-
}
451-
#if !defined(MSC_TEST)
452-
else {
453-
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to append variable");
454-
}
455-
#endif
435+
my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to append variable");
456436
goto end;
457437
}
458438
var_appended = 1;

0 commit comments

Comments
 (0)