summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-08-20 16:21:11 +0000
committerErmal <eri@pfsense.org>2010-08-20 16:21:11 +0000
commit2de2abe00cff380886b7cf0b482d6fba0263d539 (patch)
tree21424e104495216049ef8121efdf941d28bc3448 /usr
parentd09d53ac6906bdd1d94ced58872aec862e342898 (diff)
downloadpfsense-2de2abe00cff380886b7cf0b482d6fba0263d539.zip
pfsense-2de2abe00cff380886b7cf0b482d6fba0263d539.tar.gz
No need to triger a vips re-configure explicitly but rather detect this during config merges. This is the best way to do this after fixing Ticket #601.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/xmlrpc.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 93ce802..3f4de03 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -166,6 +166,7 @@ function restore_config_section_xmlrpc($raw_params) {
$config = array_merge($config, $params[0]);
$mergedkeys = implode(",", array_keys($params[0]));
write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
+ interfaces_vips_configure();
return $xmlrpc_g['return']['true'];
}
@@ -219,6 +220,7 @@ function merge_config_section_xmlrpc($raw_params) {
$config = array_merge_recursive_unique($config, $params[0]);
$mergedkeys = implode(",", array_keys($params[0]));
write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client.");
+ interfaces_vips_configure();
return $xmlrpc_g['return']['true'];
}
OpenPOWER on IntegriCloud