Merge remote branch 'origin/master'

5 files changed, 24 insertions, 22 deletions

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 6acadc0..af0e5cc 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -390,7 +390,7 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) {
 			update_filter_reload_status("Signaling CARP reload signal...");
 			carp_sync_xml($synchronizetoip, $carp['password'], $sections, $port);
 			if (is_array($mergesections))
-				carp_sync_xml($synchronizetoip, $carp['password'], $mergesections, $port, 'pfsense.merge_config_section');
+				carp_sync_xml($synchronizetoip, $carp['password'], $mergesections, $port, 'pfsense.restore_config_section');
 			$cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port);
 			$params = array(
 				XML_RPC_encode($carp['password'])
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index 14faf80..c7e8b25 100755
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -5,10 +5,6 @@ if ! /usr/bin/lockf -s -t 30 /tmp/config.lock /usr/bin/true; then
 	exit -1
 fi
 
-if [ -e /dev/ukbd0 ]; then
-        /usr/sbin/vidcontrol -s 2
-fi
-
 product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
         
 echo
diff --git a/etc/rc.stop_packages b/etc/rc.stop_packages
index 95e77fd..f20fa04 100755..100644
--- a/etc/rc.stop_packages
+++ b/etc/rc.stop_packages
@@ -51,7 +51,7 @@ else {
 
 if (is_array($config['installedpackages']['package'])) {
 	foreach($config['installedpackages']['package'] as $package) {
-		echo " Stoping package {$package['name']}...";
+		echo " Stopping package {$package['name']}...";
 		stop_service($package['name']);
 		unset($rcfiles["{$rcfileprefix}{$package['name']}.sh"]);
 		echo "done.\n";
@@ -61,7 +61,7 @@ if (is_array($config['installedpackages']['package'])) {
 $shell = @popen("/bin/sh", "w");
 if ($shell) {
         foreach ($rcfiles as $rcfile => $number) {
-		echo " Stoping {$rcfile}...";
+		echo " Stopping {$rcfile}...";
                 fwrite($shell, "{$rcfile} stop >>/tmp/bootup_messages 2>&1");
 		echo "done.\n";
 	}
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 79f65f0..bd8f48d 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -253,19 +253,6 @@ if ($_POST) {
 	unset($input_errors);
 	$pconfig = $_POST;
 
-	/*  run through $_POST items encoding HTML entties so that the user
-	 *  cannot think he is slick and perform a XSS attack on the unwilling 
-	 */
-	foreach ($_POST as $key => $value) {
-		$temp = str_replace(">", "", $value);
-			
-		if (isset($_POST['floating']) && $key == "interface")
-			continue;
-		$newpost = htmlentities($temp);
-		if($newpost <> $temp)   	 
-			$input_errors[] = sprintf(gettext("Invalid characters detected (%s).  Please remove invalid characters and save again."),$temp);		
-	}
-
 	/* input validation */
 	$reqdfields = explode(" ", "type proto");
 	if ( isset($a_filter[$id]['associated-rule-id'])===false ) {
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 97fbc45..500700a 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -271,8 +271,14 @@ $merge_config_section_sig = array(
 
 function merge_config_section_xmlrpc($raw_params) {
 	global $config, $xmlrpc_g;
-
-	return restore_config_section_xmlrpc($raw_params);
+	$params = xmlrpc_params_to_php($raw_params);
+	if(!xmlrpc_auth($params))
+		return $xmlrpc_g['return']['authfail'];
+	$config_new = array_overlay($config, $params[0]);
+	$config = $config_new;
+	$mergedkeys = implode(",", array_keys($params[0]));
+	write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."), $mergedkeys));
+	return $xmlrpc_g['return']['true'];
 }
 
 /*****************************/
@@ -448,4 +454,17 @@ $server = new XML_RPC_Server(
 
 unlock($xmlrpclockkey);
 
+    function array_overlay($a1,$a2)
+    {
+        foreach($a1 as $k => $v) {
+            if(!array_key_exists($k,$a2)) continue;
+            if(is_array($v) && is_array($a2[$k])){
+                $a1[$k] = array_overlay($v,$a2[$k]);
+            }else{
+                $a1[$k] = $a2[$k];
+            }
+        }
+        return $a1;
+    }
+
 ?>