From be5aa310862b4460beed35d8e95ea068630ff313 Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Thu, 20 Mar 2014 21:57:37 +0200
Subject: [PATCH] Rather put forwarding for DNS servers into the configuration
 file

---
 etc/inc/unbound.inc | 62 ++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc
index 2015066c49..6bc5a561f0 100644
--- a/etc/inc/unbound.inc
+++ b/etc/inc/unbound.inc
@@ -172,6 +172,35 @@ EOF;
     $unwanted_reply_threshold = (!empty($config['unbound']['unwanted_reply_threshold'])) ? $config['unbound']['unwanted_reply_threshold'] : "0";
     $verbosity = isset($config['unbound']['loglevel']) ? $config['unbound']['loglevel'] : 1;
 
+    // Set up forwarding if it configured
+    if (isset($config['unbound']['forwarding'])) {
+        $dnsservers = array();
+        if (isset($config['system']['dnsallowoverride'])) {
+            $ns = array_unique(get_nameservers());
+            foreach($ns as $nameserver) {
+                if ($nameserver)
+                    $dnsservers[] = $nameserver;
+            }
+        } else {
+            $ns = array_unique(get_dns_servers());
+            foreach($ns as $nameserver) {
+                if ($nameserver)
+                    $dnsservers[] = $nameserver;
+            }
+        }
+
+        if (!empty($dnsservers)) {
+            $forward_conf .=<<<EOD
+forward-zone:
+    name: "."
+
+EOD;
+            foreach($dnsservers as $dnsserver)
+                $forward_conf .= "\tforward-addr: $dnsserver\n";
+        }
+    } else
+        $forward_conf = "";
+
     $unboundconf = <<<EOD
 ##########################
 # Unbound Configuration
@@ -235,6 +264,9 @@ include: {$g['unbound_chroot_path']}/host_entries.conf
 # Domain overrides
 include: {$g['unbound_chroot_path']}/domainoverrides.conf
 
+# Forwarding
+{$forward_conf}
+
 {$custom_options}
 
 ###
@@ -316,10 +348,8 @@ function sync_unbound_service() {
     unbound_generate_config();
     do_as_unbound_user("start");
     require_once("service-utils.inc");
-    if (is_service_running("unbound")) {
-        do_as_unbound_user("forward");
+    if (is_service_running("unbound"))
         do_as_unbound_user("restore_cache");
-    }
 
 }
 
@@ -506,32 +536,6 @@ function unbound_control($action) {
     $cache_dumpfile = "/var/tmp/unbound_cache";
 
     switch ($action) {
-        case "forward":
-            if ($config['unbound']['forwarding_mode'] == "on") {
-               // Get configured DNS servers and add them as forwarders
-                if (!isset($config['system']['dnsallowoverride'])) {
-                    $ns = array_unique(get_nameservers());
-                    foreach($ns as $nameserver) {
-                        if($nameserver)
-                            $dns_servers .= " $nameserver";
-                    }
-                } else {
-                    $ns = array_unique(get_dns_servers());
-                    foreach($ns as $nameserver) {
-                        if($nameserver)
-                            $dns_servers .= " $nameserver";
-                    }
-                }
-
-                if(is_service_running("unbound")) {
-                    unbound_ctl_exec("forward $dns_servers");
-                } else {
-                    unbound_control("start");
-                    sleep(1);
-                    unbound_control("forward");
-                }
-            }
-            break;
         case "start":
             // Start Unbound
             if ($config['unbound']['enable'] == "on") {