From 0cea6311c545e21cc55fcf38ce8042011a8580e7 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 19 Jan 2006 00:50:49 +0000
Subject: [PATCH] Sync w/ m0n0wall 1.21 to bring back in the overlap port check

---
 usr/local/www/firewall_nat_edit.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index c1b58abf16..f75e102e5c 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -133,14 +133,16 @@ if ($_POST) {
 			continue;
 		if ($natent['external-address'] != $_POST['extaddr'])
 			continue;
-
+		if (($natent['proto'] != $_POST['proto']) && ($natent['proto'] != "tcp/udp") && ($_POST['proto'] != "tcp/udp"))
+			continue;
+		
 		list($begp,$endp) = explode("-", $natent['external-port']);
 		if (!$endp)
 			$endp = $begp;
-
+		
 		if (!(   (($_POST['beginport'] < $begp) && ($_POST['endport'] < $begp))
 		      || (($_POST['beginport'] > $endp) && ($_POST['endport'] > $endp)))) {
-
+			
 			$input_errors[] = "The external port range overlaps with an existing entry.";
 			break;
 		}