From: Kim Barthel <kbarthel@ipfire.org>
Date: Sun, 7 Oct 2012 13:25:39 +0000 (+0000)
Subject: dhclient-script and functions.dns modified to ensure that the
X-Git-Tag: 006~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9ebc53bddcff8f13d7dd0cada8b9c03b20e344f;p=network.git

dhclient-script and functions.dns modified to ensure that the
system gets the searchdomain and the dns-servers from dhcp
The resolv.conf gets updated by the scripts
---

diff --git a/dhclient-script b/dhclient-script
index 651a630e..789eee32 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -97,10 +97,15 @@ case "${reason}" in
 					routing_db_set ${interface} ipv4 local-ip-address "${new_ip_address}/${new_prefix}"
 					routing_db_set ${interface} ipv4 remote-ip-address "${new_routers}"
 					routing_db_set ${interface} ipv4 active 1
+					routing_db_set ${interface} ipv4 domain-name "${new_domain_name}"
+					routing_db_set ${interface} ipv4 domain-name-servers "${new_domain_name_servers}"
 
 					# Update the routing tables.
 					routing_update ${interface} ipv4
 					routing_default_update
+
+					# Update resolv.conf
+					dns_generate_resolvconf
 				fi
 				;;
 		esac
diff --git a/functions.dns b/functions.dns
index 7d153cd0..068ef10e 100644
--- a/functions.dns
+++ b/functions.dns
@@ -1,34 +1,36 @@
 #!/bin/bash
 ###############################################################################
 #                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2012  IPFire Network Development Team                         #
+# IPFire.org - A linux based firewall # Copyright (C) 2012 IPFire 
+# Network Development Team #
 #                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
+# This program is free software: you can redistribute it and/or modify # 
+# it under the terms of the GNU General Public License as published by # 
+# the Free Software Foundation, either version 3 of the License, or # 
+# (at your option) any later version.  #
 #                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
+# This program is distributed in the hope that it will be useful, # but 
+# WITHOUT ANY WARRANTY; without even the implied warranty of # 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the # GNU 
+# General Public License for more details.  #
 #                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+# You should have received a copy of the GNU General Public License # 
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+# #
 #                                                                             #
 ###############################################################################
 
 # Set this to true if localhost should be added as the first DNS server.
-DNS_USE_LOCAL_RESOLVER=true
-NETWORK_CONFIG_FILE_PARAMS="${NETWORK_CONFIG_FILE_PARAMS} DNS_USE_LOCAL_RESOLVER"
+DNS_USE_LOCAL_RESOLVER=true 
+NETWORK_CONFIG_FILE_PARAMS="${NETWORK_CONFIG_FILE_PARAMS} 
+DNS_USE_LOCAL_RESOLVER"
 
-# Set this option to true if the DNS servers should be queried in a random order.
-# This is useful to load balance between multiple servers.
-DNS_RANDOMIZE=false
+# Set this option to true if the DNS servers should be queried in a 
+# random order. This is useful to load balance between multiple servers.
+DNS_RANDOMIZE=false 
 NETWORK_CONFIG_FILE_PARAMS="${NETWORK_CONFIG_FILE_PARAMS} DNS_RANDOMIZE"
 
-# Set this option to true if the DNS servers should be advertised by
+# Set this option to true if the DNS servers should be advertised by 
 # radvd.
 DNS_ADVERTISE_SERVERS="true"
 
@@ -103,8 +105,8 @@ function dns_server_remove() {
 	local entries=$(dns_server_list)
 
 	while read entry priority; do
-		[ "${entry}" = "${server}" ] && continue
-		__dns_server_println "${server}" "${priority}"
+		[ "${entry}" = "${server}" ] && continue 
+__dns_server_println "${server}" "${priority}"
 	done <<< ${entries} | __dns_server_sort > ${DNS_SERVER_CONFIG_FILE}
 }
 
@@ -127,15 +129,48 @@ function dns_generate_resolvconf() {
 	fi
 
 	# XXX Add search domain.
+	local proto
+	local zone
+	local domainname
+	for zone in $(zones_get_all); do
+		for proto in ${IP_SUPPORTED_PROTOCOLS}; do
+			domainname=$(routing_db_get ${zone} ${proto} domain-name)
+			if [ -n "${domainname}" ]; then
+				print "search ${domainname}"
+			fi
+		done
+	done >> ${file}
 
 	# Add the local resolver as the first DNS server if enabled.
 	if enabled DNS_USE_LOCAL_RESOLVER; then
 		print "nameserver ::1" >> ${file}
 	fi
 
+	# First pull in zone name servers.
+	local server
+	for server in $(dns_get_zone_name_servers); do
+		print "nameserver ${server}"
+	done >> ${file}
+
 	# Dump all DNS servers (if any).
-	local server priority
+	local priority
 	dns_server_list | while read server priority; do
 		print "nameserver ${server}"
 	done >> ${file}
 }
+
+function dns_get_zone_name_servers() {
+	local servers
+	local zone
+	for zone in $(zones_get_all); do
+		local proto
+		for proto in ${IP_SUPPORTED_PROTOCOLS}; do
+			servers=$(routing_db_get ${zone} ${proto} domain-name-servers)
+
+			local server
+			for server in ${servers}; do
+				print "${server}"
+			done
+		done
+	done
+}