aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/snort/snort_xmlrpc_sync.php3
-rw-r--r--packages/tinydns/tinydns_xmlrpc_sync.php34
2 files changed, 23 insertions, 14 deletions
diff --git a/packages/snort/snort_xmlrpc_sync.php b/packages/snort/snort_xmlrpc_sync.php
index aaef83a8..db8b3f3e 100644
--- a/packages/snort/snort_xmlrpc_sync.php
+++ b/packages/snort/snort_xmlrpc_sync.php
@@ -41,6 +41,9 @@ if(!$config) {
}
function snort_do_xmlrpc_sync() {
+
+ return; /* need to fix the bug which whipes out carp sync settings, etc */
+
global $config, $g;
$syncxmlrpc = $config['installedpackages']['snort']['config'][0]['syncxmlrpc'];
/* option enabled? */
diff --git a/packages/tinydns/tinydns_xmlrpc_sync.php b/packages/tinydns/tinydns_xmlrpc_sync.php
index 752fd0e3..0610e286 100644
--- a/packages/tinydns/tinydns_xmlrpc_sync.php
+++ b/packages/tinydns/tinydns_xmlrpc_sync.php
@@ -34,20 +34,26 @@ require_once("config.inc");
require_once("/usr/local/pkg/tinydns.inc");
require_once("service-utils.inc");
-if(!$config) {
- log_error("\$config is not enabled from tinydns_xmlrpc_sync.php!!");
-} else {
- if($config['installedpackages']['carpsettings']['config'])
- $password = $config['installedpackages']['carpsettings']['config'][0]['password'];
- if($config['installedpackages']['carpsettings']['config'])
- $syncip = $config['installedpackages']['carpsettings']['config'][0]['synchronizetoip'];
- if($config['installedpackages']['carpsettings']['config'])
- $syncxmlrpc = $config['installedpackages']['tinydns']['config'][0]['syncxmlrpc'];
- /* option enabled? */
- if($syncxmlrpc)
- if($syncip)
- if($password)
- tinydns_do_xmlrpc_sync($syncip, $password);
+if($notnow) {
+
+ /* disabled until Ticket #1318 can be fixed */
+
+ if(!$config) {
+ log_error("\$config is not enabled from tinydns_xmlrpc_sync.php!!");
+ } else {
+ if($config['installedpackages']['carpsettings']['config'])
+ $password = $config['installedpackages']['carpsettings']['config'][0]['password'];
+ if($config['installedpackages']['carpsettings']['config'])
+ $syncip = $config['installedpackages']['carpsettings']['config'][0]['synchronizetoip'];
+ if($config['installedpackages']['carpsettings']['config'])
+ $syncxmlrpc = $config['installedpackages']['tinydns']['config'][0]['syncxmlrpc'];
+ /* option enabled? */
+ if($syncxmlrpc)
+ if($syncip)
+ if($password)
+ tinydns_do_xmlrpc_sync($syncip, $password);
+ }
+
}
?> \ No newline at end of file