From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
8ae272aac36b13f91f68c3e8c26dc12e65565cbb
Date: Thu, 26 Feb 2015 11:12:03 +0100
Message-ID: <20150226101203.ADB3F21EF6@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7410827914124339307=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============7410827914124339307==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 8ae272aac36b13f91f68c3e8c26dc12e65565cbb (commit)
via cee2f16fd92926109c2c6fc728a15afd18b06747 (commit)
via 85abeb137657736686d135eeaf4dc38f5a0d3a14 (commit)
from 6b696830535fd20ba0dc22e2615548e124c3328d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8ae272aac36b13f91f68c3e8c26dc12e65565cbb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Feb 26 11:11:38 2015 +0100
core88: Include fwhosts.cgi fixes in the update
commit cee2f16fd92926109c2c6fc728a15afd18b06747
Merge: 6b69683 85abeb1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Feb 26 11:11:04 2015 +0100
Merge remote-tracking branch 'amarx/BUG10753' into next
commit 85abeb137657736686d135eeaf4dc38f5a0d3a14
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed Feb 25 08:09:05 2015 +0100
BUG10753: Fix servicegroups to have only max. 15 services per protocol
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/88/filelists/files | 1 +
html/cgi-bin/fwhosts.cgi | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core=
/88/filelists/files
index 971e9e9..5ee23b9 100644
--- a/config/rootfiles/core/88/filelists/files
+++ b/config/rootfiles/core/88/filelists/files
@@ -1,4 +1,5 @@
etc/system-release
etc/issue
+srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/langs
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index c3642f0..f42947e 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -728,10 +728,10 @@ if ($fwhostsettings{'ACTION'} eq 'saveservicegrp')
}
}
}
- if ($tcpcounter > 15){
+ if ($tcpcounter > 14){
$errormessage=3D$Lang::tr{'fwhost err maxservicetcp'};
}
- if ($udpcounter > 15){
+ if ($udpcounter > 14){
$errormessage=3D$Lang::tr{'fwhost err maxserviceudp'};
}
$tcpcounter=3D0;
hooks/post-receive
--
IPFire 2.x development tree
--===============7410827914124339307==--