diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-28 17:07:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-28 17:07:50 +0000 |
| commit | e23fbf48a75432d21347d7d784f729d09e44230a (patch) | |
| tree | 2a72fa1e0ec2f8ea825ebd799679a8d4ee40e11a /phpBB/includes | |
| parent | 81886c0eae6857d0b00ffbf1ed8c40ace8e88d57 (diff) | |
| download | forums-e23fbf48a75432d21347d7d784f729d09e44230a.tar forums-e23fbf48a75432d21347d7d784f729d09e44230a.tar.gz forums-e23fbf48a75432d21347d7d784f729d09e44230a.tar.bz2 forums-e23fbf48a75432d21347d7d784f729d09e44230a.tar.xz forums-e23fbf48a75432d21347d7d784f729d09e44230a.zip | |
Bug #29635
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8675 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index be3dac3449..8c194f4fc2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2884,7 +2884,7 @@ function phpbb_checkdnsrr($host, $type = '') } // @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); - @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); + @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host) . '.', $output); // If output is empty, the nslookup failed if (empty($output)) @@ -2910,7 +2910,8 @@ function phpbb_checkdnsrr($host, $type = '') } else if (function_exists('checkdnsrr')) { - return (checkdnsrr($host, $type)) ? true : false; + // The dot indicates to search the DNS root (helps those having DNS prefixes on the same domain) + return (checkdnsrr($host . '.', $type)) ? true : false; } return NULL; |