From 72cd706b8dc5032122e171a3abce7529917e1ce6 Mon Sep 17 00:00:00 2001 From: bcyrill Date: Wed, 11 Apr 2012 23:12:34 +0300 Subject: [PATCH] Remove [] of literal IPv6 addresses --- usr/local/www/diag_dns.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php index 63c119af10..0596373d31 100644 --- a/usr/local/www/diag_dns.php +++ b/usr/local/www/diag_dns.php @@ -93,14 +93,13 @@ if ($_POST) { $reqdfieldsn = explode(",", "Host"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - $host = trim($_POST['host']); - $host_esc = escapeshellarg(trim($_POST['host'])); + $host = trim($_POST['host'], " \t\n\r\0\x0B[]"); + $host_esc = escapeshellarg($host); - if (!is_hostname($host) && !is_ipaddr($host)) + if (!is_hostname($host) && !is_ipaddr($host)) { $input_errors[] = gettext("Host must be a valid hostname or IP address."); - - // Test resolution speed of each DNS server. - if ((is_hostname($host) || is_ipaddr($host))) { + } else { + // Test resolution speed of each DNS server. $dns_speeds = array(); $resolvconf_servers = `grep nameserver /etc/resolv.conf | cut -f2 -d' '`; $dns_servers = explode("\n", trim($resolvconf_servers));