From 8d16f1a0ecfe675de1b78639da7db18295d115a9 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 9 Aug 2015 19:58:33 +0200
Subject: sshdcond - fix sshdcond_sync_on_changes() logic

---
 config/sshdcond/sshdcond.inc | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index 756f1556..fa996386 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -117,19 +117,22 @@ 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;
-		}
-	}
-
-	log_error("[sshdcond] xmlrpc sync is starting.");
-	foreach ($config['installedpackages']['sshdcondsync']['config'] as $rs) {
-		foreach($rs['row'] as $sh) {
-			$sync_to_ip = $sh['ipaddress'];
-			$password = $sh['password'];
-			if ($password && $sync_to_ip) {
-				sshdcond_do_xmlrpc_sync($sync_to_ip, $password);
+	if (!is_array($config['installedpackages']['sshdcondsync'])) {
+		/* Basically, this package was never configured */
+		return;
+	} elseif (!$config['installedpackages']['sshdcondsync']['config'][0]['synconchanges']) {
+		/* Package is configured but XMLRPC sync is disabled */
+		return;
+	} else {
+		/* Do XMLRPC sync */
+		log_error("[sshdcond] xmlrpc sync is starting.");
+		foreach ($config['installedpackages']['sshdcondsync']['config'] as $rs) {
+			foreach($rs['row'] as $sh) {
+				$sync_to_ip = $sh['ipaddress'];
+				$password = $sh['password'];
+				if ($password && $sync_to_ip) {
+					sshdcond_do_xmlrpc_sync($sync_to_ip, $password);
+				}
 			}
 		}
 	}
-- 
cgit v1.2.3


From ddc664d5d206418364b31b2edebd573e80b21c1b Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 9 Aug 2015 20:00:22 +0200
Subject: Bump sshdcond package version

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 7c9ce26c..c950d2a0 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1350,7 +1350,7 @@
 			]]>
 		</descr>
 		<category>Enhancements</category>
-		<version>1.0.2</version>
+		<version>1.0.3</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sshdcond/sshdcond.xml</config_file>
-- 
cgit v1.2.3


From de0a96f7ddea5013663b390c075cb564fd39e6a1 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 9 Aug 2015 20:05:21 +0200
Subject: Only log something when needed

---
 config/sshdcond/sshdcond.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index fa996386..d68ece7f 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -135,8 +135,8 @@ function sshdcond_sync_on_changes() {
 				}
 			}
 		}
+		log_error("[sshdcond] xmlrpc sync is ending.");
 	}
-	log_error("[sshdcond] xmlrpc sync is ending.");
 }
 
 /* Do the actual XMLRPC sync. */
-- 
cgit v1.2.3


From d1e94cb5821e6bb5d5e3d05e2e5c47ec81b87730 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 13:28:01 +0200
Subject: sshdcond.inc - fix  sshdcond_sync_on_changes() logic take two

---
 config/sshdcond/sshdcond.inc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/sshdcond/sshdcond.inc b/config/sshdcond/sshdcond.inc
index d68ece7f..12af3551 100644
--- a/config/sshdcond/sshdcond.inc
+++ b/config/sshdcond/sshdcond.inc
@@ -117,26 +117,26 @@ function sshdcond_custom_php_write_config() {
 function sshdcond_sync_on_changes() {
 	global $config, $g;
 
+	/* Basically, this package was never configured */
 	if (!is_array($config['installedpackages']['sshdcondsync'])) {
-		/* Basically, this package was never configured */
 		return;
-	} elseif (!$config['installedpackages']['sshdcondsync']['config'][0]['synconchanges']) {
-		/* Package is configured but XMLRPC sync is disabled */
+	}
+	/* Package is configured but XMLRPC sync is disabled */
+	if (!isset($config['installedpackages']['sshdcondsync']['config'][0]['synconchanges'])) {
 		return;
-	} else {
-		/* Do XMLRPC sync */
-		log_error("[sshdcond] xmlrpc sync is starting.");
-		foreach ($config['installedpackages']['sshdcondsync']['config'] as $rs) {
-			foreach($rs['row'] as $sh) {
-				$sync_to_ip = $sh['ipaddress'];
-				$password = $sh['password'];
-				if ($password && $sync_to_ip) {
-					sshdcond_do_xmlrpc_sync($sync_to_ip, $password);
-				}
+	}
+	/* Do XMLRPC sync */
+	log_error("[sshdcond] xmlrpc sync is starting.");
+	foreach ($config['installedpackages']['sshdcondsync']['config'] as $rs) {
+		foreach($rs['row'] as $sh) {
+			$sync_to_ip = $sh['ipaddress'];
+			$password = $sh['password'];
+			if ($password && $sync_to_ip) {
+				sshdcond_do_xmlrpc_sync($sync_to_ip, $password);
 			}
 		}
-		log_error("[sshdcond] xmlrpc sync is ending.");
 	}
+	log_error("[sshdcond] xmlrpc sync is ending.");
 }
 
 /* Do the actual XMLRPC sync. */
-- 
cgit v1.2.3