Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/filter.inc
	usr/local/www/themes/the_wall/rrdcolors.inc.php

1 files changed, 7 insertions, 4 deletions

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index c3c2899..d588e8a 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -101,7 +101,8 @@ function carp_check_version($url, $password, $port = 80, $method = 'pfsense.host
 		while ($numberofruns < 2) {
 			$msg = new XML_RPC_Message($method, $params);
 			$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-			$username = $config['system']['user'][0]['name'];
+			/* XXX: Configurable from the GUI?! */
+			$username = "admin";
 			$cli->setCredentials($username, $password);
 			if($numberofruns > 1)
 				$cli->setDebug(1);
@@ -235,7 +236,8 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
 		log_error("Beginning XMLRPC sync to {$url}:{$port}.");
 		$msg = new XML_RPC_Message($method, $params);
 		$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-		$username = $config['system']['user'][0]['name'];
+		/* XXX: Configurable from the GUI?! */
+		$username = "admin";
 		$cli->setCredentials($username, $password);
 		if($numberofruns > 1)
 			$cli->setDebug(1);
@@ -272,7 +274,7 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) {
 	update_filter_reload_status("Building CARP sync information");
 	foreach($config['installedpackages']['carpsettings']['config'] as $carp) {
 		if (empty($carp['synchronizetoip'])) {
-			log_error("CARP sync not being done because of missing sync ip!");
+			log_error("Config sync not being done because of missing sync IP (normal on secondary systems).");
 			break;
 		}
 		/*
@@ -396,7 +398,8 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) {
 			);
 
 			$msg = new XML_RPC_Message('pfsense.filter_configure', $params);
-			$username = $config['system']['user'][0]['name'];
+			/* XXX: Configurable from the GUI */
+			$username = "admin";
 			$cli->setCredentials($username, $carp['password']);
 			$resp = $cli->send($msg, "900");