From 5f41efb99f917fc68f925a64b56fcff153424e4f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 16 Feb 2016 06:53:22 +0100
Subject: [PATCH] dhcp: add dns resolver ip in bootp ACK; closes #483

---
 src/etc/inc/services.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 94c599f27..d7bf362f8 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -627,7 +627,7 @@ EOPP;
             if (!empty($newzone['domain-name'])) {
                 $newzone['dns-servers'] = $dhcpifconf['dnsserver'];
             }
-        } elseif (isset($config['dnsmasq']['enable'])) {
+        } elseif (isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) {
             $dnscfg .= "  option domain-name-servers {$ifcfgip};";
             if ($newzone['domain-name'] && !empty($config['system']['dnsserver'][0])) {
                 $newzone['dns-servers'] = $config['system']['dnsserver'];
@@ -1241,7 +1241,7 @@ EOD;
 
         if (isset($dhcpv6ifconf['dnsserver'][0])) {
             $dnscfgv6 .= "  option dhcp6.name-servers " . join(",", $dhcpv6ifconf['dnsserver']) . ";";
-        } else if ((isset($config['dnsmasq']['enable'])) && (is_ipaddrv6($ifcfgipv6))) {
+        } else if ((isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) && (is_ipaddrv6($ifcfgipv6))) {
             $dnscfgv6 .= "  option dhcp6.name-servers {$ifcfgipv6};";
         } else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) {
             $dns_arrv6 = array();