From ad5065e04da2d375bdfdf987d1d52a5f4d76a5f0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 1 Apr 2015 13:52:35 +0200
Subject: [PATCH] firewall: remove arbitrary restriction; pf(4) can cope with
 it

---
 src/www/firewall_rules_edit.php | 5 +----
 src/www/services_snmp.php       | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 409b4e62f..b252c814c 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2005 Scott Ullrich (sullrich@gmail.com)
@@ -283,10 +284,6 @@ if ($_POST) {
 		}
 	}
 
-	if (($_POST['proto'] != "tcp") && ($_POST['proto'] != "udp") && ($_POST['proto'] != "tcp/udp") && ($_POST['proto'] != "icmp")) {
-		if($_POST['ipprotocol'] == "inet46")
-			$input_errors[] =  gettext("You can not assign a protocol other then ICMP, TCP, UDP or TCP/UDP to a rule that applies to IPv4 and IPv6");
-	}
 	if (($_POST['proto'] == "icmp") && ($_POST['icmptype'] <> "")){
 		if($_POST['ipprotocol'] == "inet46")
 			$input_errors[] =  gettext("You can not assign a ICMP type to a rule that applies to IPv4 and IPv6");
diff --git a/src/www/services_snmp.php b/src/www/services_snmp.php
index b40cdf159..9c519df2d 100644
--- a/src/www/services_snmp.php
+++ b/src/www/services_snmp.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -342,7 +343,7 @@ function enable_change(whichone) {
 								  <td width="22%" valign="top" class="vncellreq">Write community string</td>
 						          <td width="78%" class="vtable">
 						                    <input name="rwcommunity" type="text" class="formfld unknown" id="rwcommunity" size="40" value="<?=htmlspecialchars($pconfig['rwcommunity']);?>" />
-								    <br />Please use something other then &quot;private&quot; here<br />
+								    <br />Please use something other than &quot;private&quot; here<br />
 								  </td>
 						                </tr>
 									*/