aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-08-16 00:09:55 -0500
committerChris Buechler <cmb@pfsense.org>2015-08-16 00:09:55 -0500
commit7f77d22a3bca3c6c3e048fb823a893b85eedee49 (patch)
treebeffdda5ce78a7573220f510b5b52c24b09e6c7c /config
parent1934e0aac8cde4954a3edc38bae3dc449583c2bf (diff)
parentd1e94cb5821e6bb5d5e3d05e2e5c47ec81b87730 (diff)
downloadpfsense-packages-7f77d22a3bca3c6c3e048fb823a893b85eedee49.tar.gz
pfsense-packages-7f77d22a3bca3c6c3e048fb823a893b85eedee49.tar.bz2
pfsense-packages-7f77d22a3bca3c6c3e048fb823a893b85eedee49.zip
Merge pull request #971 from doktornotor/patch-17
Diffstat (limited to 'config')
-rw-r--r--config/sshdcond/sshdcond.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index 756f1556..12af3551 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -117,12 +117,15 @@ function sshdcond_custom_php_write_config() {
function sshdcond_sync_on_changes() {
global $config, $g;
- if (is_array($config['installedpackages']['sshdcondsync'])) {
- if (!$config['installedpackages']['sshdcondsync']['config'][0]['synconchanges']) {
- return;
- }
+ /* Basically, this package was never configured */
+ if (!is_array($config['installedpackages']['sshdcondsync'])) {
+ return;
}
-
+ /* Package is configured but XMLRPC sync is disabled */
+ if (!isset($config['installedpackages']['sshdcondsync']['config'][0]['synconchanges'])) {
+ return;
+ }
+ /* Do XMLRPC sync */
log_error("[sshdcond] xmlrpc sync is starting.");
foreach ($config['installedpackages']['sshdcondsync']['config'] as $rs) {
foreach($rs['row'] as $sh) {