From 9ed1200c1e788bf0974611e28e54dcd2dab36d59 Mon Sep 17 00:00:00 2001 From: brenosilva Date: Sun, 3 Apr 2011 04:23:22 +0000 Subject: [PATCH] Fix ipmatch issues --- apache2/re_operators.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apache2/re_operators.c b/apache2/re_operators.c index 15a1aefe..7c58433c 100644 --- a/apache2/re_operators.c +++ b/apache2/re_operators.c @@ -443,8 +443,6 @@ static int msre_op_ipmatch_execute(modsec_rec *msr, msre_rule *rule, msre_var *v return -1; } - ipaddr = ntohl(addr.s_addr) -1; - for (; ipdata != NULL; ipdata = ipdata->next) { if(ipdata->type == 4) { @@ -453,9 +451,9 @@ static int msre_op_ipmatch_execute(modsec_rec *msr, msre_rule *rule, msre_var *v return -1; } - ipaddr = ntohl(addr.s_addr) -1; + ipaddr = ntohl(addr.s_addr); - if( ipaddr >= ipdata->start && ipaddr <= ipdata->end) + if( (ipaddr >= ipdata->start) && (ipaddr <= ipdata->end)) return 1; } else if (ipdata->type == 6) {