From mboxrd@z Thu Jan 1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
19602b681f9b5d88578162319366e7efde768352
Date: Tue, 14 Jan 2020 21:01:53 +0000
Message-ID: <47y2vQ0RyLz2yJC@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6542646877582928092=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============6542646877582928092==
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 19602b681f9b5d88578162319366e7efde768352 (commit)
via 3a5866ac2bc26ddbc5c51192dbc4f653b879036a (commit)
from a877032915898b07dcacd165c0f89e427bc672a4 (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 19602b681f9b5d88578162319366e7efde768352
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Jan 14 13:53:59 2020 +0100
dns.cgi: Fix ID and greater than checks.
=20
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3a5866ac2bc26ddbc5c51192dbc4f653b879036a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Jan 14 12:14:02 2020 +0100
dns.cgi: Set kdig params for timeout and retry back to default.
=20
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/dns.cgi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index ff228422b..11415cdf8 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -634,7 +634,7 @@ END
# Nameservers with an ID's of one or two are ISP assigned,
# and we cannot perform any actions on them, so hide the tools for
# them.
- if ($id gt "2") {
+ if ($id > 2) {
=20
print <<END;
<td align=3D'center' width=3D'5%' $col>
@@ -677,7 +677,7 @@ END
print"<table width=3D'100%'>\n";
=20
# Check if the usage of the ISP nameservers is enabled and there are more =
than 2 servers.
- if (($settings{'USE_ISP_NAMESERVERS'} eq "on") && ($server_amount gt "2"))=
{
+ if (($settings{'USE_ISP_NAMESERVERS'} eq "on") && ($server_amount > 2)) {
print <<END;
<tr>
<td class=3D'boldbase'> <b>$Lang::tr{'legend'}:</b></td>
@@ -847,7 +847,7 @@ sub check_nameserver($$$$) {
}
=20
# Default values.
- my @command =3D ("kdig", "+timeout=3D2", "+retry=3D0", "+dnssec",
+ my @command =3D ("kdig", "+dnssec",
"+bufsize=3D1232");
=20
# Handle different protols.
hooks/post-receive
--
IPFire 2.x development tree
--===============6542646877582928092==--