From 1d1bcc341636aa93f353908f5ac6433611fe2b65 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 15 Mar 2010 19:20:46 -0400
Subject: Reload zone correctly on the primary dns server without needing to do
 an operation twice

---
 config/tinydns/tinydns.inc         |  1 -
 config/tinydns/tinydns_domains.xml | 19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'config/tinydns')

diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index 9d0cf2d3..e8500bca 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -359,7 +359,6 @@ function tinydns_create_zone_file() {
 	conf_mount_rw();
 	if(file_exists("/tmp/config.cache"))
 		unlink("/tmp/config.cache");
-	parse_config(true);
 	config_lock();
 	if(file_exists("/service/tinydns/root/data"))
 		exec("rm -f /service/tinydns/root/data");
diff --git a/config/tinydns/tinydns_domains.xml b/config/tinydns/tinydns_domains.xml
index 33647bac..247227d8 100644
--- a/config/tinydns/tinydns_domains.xml
+++ b/config/tinydns/tinydns_domains.xml
@@ -232,28 +232,15 @@
 		}
 	</custom_php_validation_command>
 	<custom_add_php_command>
-		$dnssync = true;
-		log_error("Begin tinydns add");		
+	</custom_add_php_command>
+	<custom_php_resync_config_command>
+		log_error("Begin tinydns resync");
 		tinydns_create_zone_file();
 		log_error("Zone file done.");
 		tinydns_setup_ping_items();
 		log_error("Ping items done.");
 		tinydns_sync_on_changes();
 		log_error("Sync items done.");
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-		if(!$dnssync) {
-			log_error("Begin tinydns resync");
-			tinydns_create_zone_file();
-			log_error("Zone file done.");
-			tinydns_setup_ping_items();
-			log_error("Ping items done.");
-			tinydns_sync_on_changes();
-			log_error("Sync items done.");
-		} else {
-			tinydns_create_zone_file();
-			tinydns_setup_ping_items();
-		}
 	</custom_php_resync_config_command>
 	<custom_php_command_before_form>	
 		unset($_POST['temp']);
-- 
cgit v1.2.3