@@ -333,14 +333,8 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
333
333
if (match == 1 ) {
334
334
rc = msre_parse_targets (ruleset , p , rule -> targets , & my_error_msg );
335
335
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" );
344
338
goto end ;
345
339
}
346
340
if (msr ) {
@@ -354,14 +348,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
354
348
var_appended = 1 ;
355
349
356
350
} 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" );
365
352
goto end ;
366
353
}
367
354
}
@@ -445,14 +432,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
445
432
if (match == 0 ) {
446
433
rc = msre_parse_targets (ruleset , p , rule -> targets , & my_error_msg );
447
434
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" );
456
436
goto end ;
457
437
}
458
438
var_appended = 1 ;
0 commit comments