diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 6c0ffd15..b553c9f6 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -679,7 +679,7 @@ static const char *add_rule(cmd_parms *cmd, directory_config *dcfg, int type, if ((rule->actionset->id != NULL) && apr_table_get(dcfg->tmp_rule_placeholders, rule->actionset->id)) { msre_rule *phrule = apr_palloc(rule->ruleset->mp, sizeof(msre_rule)); if (phrule == NULL) { - return FATAL_ERROR; + return FATAL_ERROR; } #ifdef DEBUG_CONF diff --git a/apache2/re_actions.c b/apache2/re_actions.c index 5f86b1b8..dd076a5e 100644 --- a/apache2/re_actions.c +++ b/apache2/re_actions.c @@ -713,12 +713,12 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, msr->txcfg->is_enabled = MODSEC_ENABLED; msr->usercfg->is_enabled = MODSEC_ENABLED; } - else + else if (strcasecmp(value, "off") == 0) { msr->txcfg->is_enabled = MODSEC_DISABLED; msr->usercfg->is_enabled = MODSEC_DISABLED; } - else + else if (strcasecmp(value, "detectiononly") == 0) { msr->txcfg->is_enabled = MODSEC_DETECTION_ONLY; msr->usercfg->is_enabled = MODSEC_DETECTION_ONLY; @@ -761,12 +761,12 @@ static apr_status_t msre_action_ctl_execute(modsec_rec *msr, apr_pool_t *mptmp, msr->txcfg->auditlog_flag = AUDITLOG_ON; msr->usercfg->auditlog_flag = AUDITLOG_ON; } - else + else if (strcasecmp(value, "off") == 0) { msr->txcfg->auditlog_flag = AUDITLOG_OFF; msr->usercfg->auditlog_flag = AUDITLOG_OFF; } - else + else if (strcasecmp(value, "relevantonly") == 0) { msr->txcfg->auditlog_flag = AUDITLOG_RELEVANT; msr->usercfg->auditlog_flag = AUDITLOG_RELEVANT; diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 856c8f06..f9070427 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -1125,7 +1125,7 @@ static int msre_op_geoLookup_execute(modsec_rec *msr, msre_rule *rule, msre_var rc = geo_lookup(msr, &rec, geo_host, error_msg); if (rc <= 0) { - *error_msg = apr_psprintf(msr->mp, "Geo lookup for \"%s\" failed at %s.", log_escape_nq(msr->mp, geo_host), var->name); + *error_msg = apr_psprintf(msr->mp, "Geo lookup for \"%s\" failed at %s.", log_escape_nq(msr->mp, geo_host), var->name); return rc; } *error_msg = apr_psprintf(msr->mp, "Geo lookup for \"%s\" succeeded at %s.",