From 37b6af24f8df111e9e19ded1d3329e5a35613622 Mon Sep 17 00:00:00 2001
From: plinss <peter@linss.com>
Date: Wed, 3 Jul 2013 12:40:31 -0700
Subject: Add entry for lan interface ipv6 address

---
 config/unbound/unbound.inc | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index d7b2f2c5..4118610d 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -820,30 +820,49 @@ function unbound_add_host_entries() {
 		$unbound_entries .= "local-data: \"localhost.{$syscfg['domain']} AAAA ::1\"\n";
 	}
 
+	$added_item_v4 = array();
+	$added_item_v6 = array();
 	if ($config['interfaces']['lan']) {
+		$current_host = $syscfg['hostname'].".".$syscfg['domain'];
 		$cfgip = get_interface_ip("lan");
 		if (is_ipaddr($cfgip)) {
-			$unbound_entries .= "local-data-ptr: \"{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\"\n";
-			$unbound_entries .= "local-data: \"{$syscfg['hostname']}.{$syscfg['domain']} A {$cfgip}\"\n";
+			$unbound_entries .= "local-data-ptr: \"{$cfgip} {$current_host}\"\n";
+			$unbound_entries .= "local-data: \"{$current_host} A {$cfgip}\"\n";
 			$unbound_entries .= "local-data: \"{$syscfg['hostname']} A {$cfgip}\"\n";
+			$added_item_v4[$current_host] = true;
+		}
+		$cfgip6 = get_interface_ipv6("lan");
+		if (is_ipaddrv6($cfgip6)) {
+			$unbound_entries .= "local-data-ptr: \"{$cfgip6} {$current_host}\"\n";
+			$unbound_entries .= "local-data: \"{$current_host} AAAA {$cfgip6}\"\n";
+			$unbound_entries .= "local-data: \"{$syscfg['hostname']} AAAA {$cfgip6}\"\n";
+			$added_item_v6[$current_host] = true;
 		}
 	} else {
 		$sysiflist = get_configured_interface_list();
 		foreach ($sysiflist as $sysif) {
 			if (!interface_has_gateway($sysif)) {
+				$current_host = $syscfg['hostname'].".".$syscfg['domain'];
 				$cfgip = get_interface_ip($sysif);
 				if (is_ipaddr($cfgip)) {
-					$unbound_entries .= "local-data-ptr: \"{$cfgip} {$syscfg['hostname']}.{$syscfg['domain']}\"\n";
-					$unbound_entries .= "local-data: \"{$syscfg['hostname']}.{$syscfg['domain']} A {$cfgip}\"\n";
+					$unbound_entries .= "local-data-ptr: \"{$cfgip} {$current_host}\"\n";
+					$unbound_entries .= "local-data: \"{$current_host} A {$cfgip}\"\n";
 					$unbound_entries .= "local-data: \"{$syscfg['hostname']} A {$cfgip}\"\n";
-					break;
+					$added_item_v4[$current_host] = true;
 				}
+				$cfgip6 = get_interface_ipv6($sysif);
+				if (is_ipaddr($cfgip6)) {
+					$unbound_entries .= "local-data-ptr: \"{$cfgip6} {$current_host}\"\n";
+					$unbound_entries .= "local-data: \"{$current_host} AAAA {$cfgip6}\"\n";
+					$unbound_entries .= "local-data: \"{$syscfg['hostname']} AAAA {$cfgip6}\"\n";
+					$added_item_v6[$current_host] = true;
+				}
+				if (is_ipaddr($cfgip) || is_ipaddr($cfgip6))
+					break;
 			}
 		}
 	}
 
-	$added_item_v4 = array();
-	$added_item_v6 = array();
 	// DNSMasq entries static host entries
 	if (isset($dnsmasqcfg['hosts'])) {
 		$hosts = $dnsmasqcfg['hosts'];
@@ -852,7 +871,7 @@ function unbound_add_host_entries() {
 		foreach ($hosts as $host) {
 			$current_host = ($host['host'] != "") ? $host['host'].".".$host['domain'] : $host['domain'];
 			if (function_exists("is_ipaddrv6") && is_ipaddrv6($host['ip'])) {
-				if (!$added_item_v6[$curent_host]) {
+				if (!$added_item_v6[$current_host]) {
 					$host_entries .= "local-data-ptr: \"{$host['ip']} {$current_host}\"\n";
 					$host_entries .= "local-data: \"{$current_host} IN AAAA {$host['ip']}\"\n";
 					$added_item_v6[$current_host] = true;
-- 
cgit v1.2.3