From e23fbf48a75432d21347d7d784f729d09e44230a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 28 Jun 2008 17:07:50 +0000 Subject: [PATCH] Bug #29635 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8675 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index cb7d820f47..fa08d3b26a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -115,6 +115,7 @@
  • [Fix] Correctly display double-colon on special conditions within highlighted php source (Bug #26795)
  • [Fix] Increase storage capacity of titles/subjects due to specialchared content (Bug #25235)
  • [Fix] Catch invalid username wildcard ban (we do not support these) (Bug #29305)
    • +
  • [Fix] Fix (email)-domain checks for those having DNS prefixes set (Bug #29635)
  • [Change] Adjust truncate_string() to be able to adjust the maximum storage length.
  • [Change] Generalize load check (Bug #21255 / thanks to Xipher)
  • [Change] Make utf8_htmlspecialchars not pass its argument by reference (Bug #21885)
    • 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;