From d9dae47ae008f85d85b1f8fbf7527285e6f8eba9 Mon Sep 17 00:00:00 2001
From: Wytze van der Raay <wytze@cacert.org>
Date: Mon, 15 Jul 2013 08:35:59 +0000
Subject: [PATCH] Fix for http://bugs.cacert.org/view.php?id=1186 warning when
 determining MX records of a domain.

---
 includes/general.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/includes/general.php b/includes/general.php
index 6e1faa9..d89c0e6 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -543,10 +543,15 @@
 #echo `dig +short mx heise.de 2>&1`."-<br>\n";
 
 			$list = explode("\n", $line);
-			foreach($list as $row)
-				list($pri, $mxhosts[]) = explode(" ", substr(trim($row), 0, -1));
+			foreach($list as $row) {
+				if(!strstr($row, " ")) {
+					continue;
+				}
+				list($pri, $mxhosts[]) = explode(" ", trim($row), 2);
+			}
 			$mxhosts[] = $domain;
-#print_r($mxhosts); die;
+			array_walk($mxhosts, function(&$mx) { $mx = trim($mx, '.'); } );
+
 			foreach($mxhosts as $key => $domain)
 			{
 				$fp = @fsockopen($domain,25,$errno,$errstr,5);