From: Alexander Marx <amarx@ipfire.org>
Date: Mon, 6 Jan 2014 04:03:40 +0000 (+0100)
Subject: Firewall: deleted subnet from source and target addresses if manually used
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f4d5310decf8cd8f16d92bfe0457cc8fb87fc663;ds=sidebyside

Firewall: deleted subnet from source and target addresses if manually used
---

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 538df60cc..8b02b0446 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1553,6 +1553,11 @@ sub newrule
 			}
 		}	
 	}
+	# Split manual source and target address and delete the subnet
+	my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
+	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
+	my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
+	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
 	&Header::closebox();
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});