Initialize variables correctly

1) gmirror.inc: there are two calls to exec(), those calls expect the 2nd parameter to be an array, this commit initializes the variables correctly. 2) system.php: variable dnslist is used as an array without prior type initialization. This is one of the causes for apparent PR #2680 problems (which led to its reversal). Note: After this commit is merged PR #2680 may be safely reapplied for more tough code.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/etc/inc/gmirror.inc b/src/etc/inc/gmirror.inc
index c183282..8ac173a 100644
--- a/src/etc/inc/gmirror.inc
+++ b/src/etc/inc/gmirror.inc
@@ -284,7 +284,7 @@ function gmirror_get_consumer_metadata($consumer) {
 	if (!is_valid_consumer($consumer)) {
 		return array();
 	}
-	$output = "";
+	$output = array();
 	exec("/sbin/gmirror dump " . escapeshellarg($consumer), $output);
 	return array_map('trim', $output);
 }
@@ -341,7 +341,7 @@ function gmirror_get_all_unused_consumer_sizes_on_disk($disk) {
 	if (!is_valid_disk($disk) || !is_consumer_unused($disk)) {
 		return array();
 	}
-	$output = "";
+	$output = array();
 	exec("/sbin/geom part list " . escapeshellarg($disk) . " | /usr/bin/egrep '(Name:|Mediasize:)' | /usr/bin/cut -c4- | /usr/bin/sed -l -e 'N;s/\\nMediasize://;P;D;' | /usr/bin/cut -c7-", $output);
 	if (empty($output)) {
 		exec("/sbin/geom disk list " . escapeshellarg($disk) . " | /usr/bin/egrep '(Name:|Mediasize:)' | /usr/bin/cut -c4- | /usr/bin/sed -l -e 'N;s/\\nMediasize://;P;D;' | /usr/bin/cut -c7-", $output);