Merge branch 'master' into next

diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files
index 9d397077265cd62c713d49d26428286ec806a341..034310c96113953ddb43a5d50447fbee7770a6a4 100644 (file)
--- a/config/rootfiles/core/50/filelists/files
+++ b/config/rootfiles/core/50/filelists/files
@@ -3,6 +3,7 @@ var/ipfire/langs/
 etc/rc.d/init.d/console
 usr/local/sbin/setup
 var/ipfire/graphs.pl
+srv/web/ipfire/cgi-bin/portfw.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 usr/local/share/GeoIP/GeoIP.dat
 usr/share/hwdata/pci.ids

diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index 5583fb88a555eb4136f6383c99abedbdf606749a..199682f44fb81affd96cbaeab90538a3503ec5e7 100644 (file)
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -1038,7 +1038,7 @@ sub disallowreserved
 {
        # port 67 and 68 same for tcp and udp, don't bother putting in an array
        my $msg = "";
-       my @tcp_reserved = (81,222,444);
+       my @tcp_reserved = ();
        my $prt = $_[0]; # the port or range
        my $ryn = $_[1]; # tells us whether or not it is a port range
        my $prot = $_[2]; # protocol