From b272c6f912c372d7f68f8618fc0a31843c08efd7 Mon Sep 17 00:00:00 2001
From: Alexandre Anriot <aanriot@evolix.fr>
Date: Tue, 20 Sep 2005 07:36:56 +0000
Subject: [PATCH] bogues de regexp.

---
 admin/lib/Evoauth/Iptables.pm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/admin/lib/Evoauth/Iptables.pm b/admin/lib/Evoauth/Iptables.pm
index 0244a43..4c97467 100644
--- a/admin/lib/Evoauth/Iptables.pm
+++ b/admin/lib/Evoauth/Iptables.pm
@@ -155,15 +155,15 @@ sub Control() {
 
 	# initialisation d'Evoauth
 	if ($action == 1) {
-		foreach my $rule1 (@rules) {
-			next if m/^\#/;
-			chomp $rule1;
+		foreach (@rules) {
+			next if /^#/;
+			chomp;
 
 			# on supprimer les commentaires
-			$rule1 =~ s/(\#*)$//;
+			$_ =~ s/#.*//;
 
 			# on split la liste des paramètres
-			my @tmp1 = split (/\t/, $rule1);
+			my @tmp1 = split (/\t+/);
 
 			system("/sbin/iptables -t nat -A PREROUTING -p $tmp1[2] -i ppp0 --dport $tmp1[1] -j DNAT --to $tmp1[0]:$tmp1[1] 2>/dev/null");
 		}
@@ -176,15 +176,15 @@ sub Control() {
 		&Evoauth::Functions::Log("2 - Tables crées");
 
 		# chargement des règles
-		foreach my $rule2 (@rules) {
-			next if m/^\#/;
-			chomp $rule2;
+		foreach (@rules) {
+			next if /^#/;
+			chomp;
 
 			# on supprimer les commentaires
-			$rule2 =~ s/(\#*)$//;
+			$_ =~ s/#.*//;
 
 			# on split la liste des paramètres
-			my @tmp2 = split (/\t/, $rule2);
+			my @tmp2 = split (/\t+/);
 
 			system("/sbin/iptables -A FORWARD -p $tmp2[2] -i ppp0 -o eth0 --dport $tmp2[1] -j EVOAUTH 2>/dev/null");
 		}
@@ -199,15 +199,15 @@ sub Control() {
 		system("/sbin/iptables -F EVOAUTH 2>/dev/null");
 		&Evoauth::Functions::Log("1 - Flush de la table EVOAUTH");
 
-		foreach my $rule3 (@rules) {
-			next if m/^\#/;
-			chomp $rule3;
+		foreach (@rules) {
+			next if /^#/;
+			chomp;
 
 			# on supprimer les commentaires
-			$rule3 =~ s/(\#*)$//;
+			$_ =~ s/#.*//;
 
 			# on split la liste des paramètres
-			my @tmp3 = split (/\t/, $rule3);
+			my @tmp3 = split (/\t+/);
 
 			system("/sbin/iptables -D FORWARD -p $tmp3[2] -i ppp0 -o eth0 --dport $tmp3[1] -j EVOAUTH 2>/dev/null");
 			system("/sbin/iptables -t nat -D PREROUTING -p $tmp3[2] -i ppp0 --dport $tmp3[1] -j DNAT --to $tmp3[0]:$tmp3[1] 2>/dev/null");