[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-14-g02638d8

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 33a3b10a00920cd5e7886d6320e81b7af1dc35aa
Author: Peter Marschall <peter at adpm.de>
Date:   Sat Jan 8 12:41:37 2011 +0100

    dhclient-script.linux: fix domain_name in domain_search check
    
    * Fix the check whether $new_domain_name is an element of $new_domain_search
      in make_resolv_conf() of dhclient-script.linux by iterating over the
      individual elements of $new_domain_search instead of errorneously
      treating them as one big blob.
    * Fix usage of $domain_in_search_list
    * Check $new_domain_name and "${new_domain_name}." against elements
      of $new_domain_search as elements of $new_domain search seem to get
      "." appended autmatically in the server
    
    Signed-off-by: Peter Marschall <peter at adpm.de>

diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 222b748..3c103ec 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -23,12 +23,13 @@ make_resolv_conf() {
 	    #new_domain_search="${new_domain_search% }"
 	    if [ "$new_domain_name" ]; then
 		domain_in_search_list=""
-		for domain in "$new_domain_search"; do
-			if [ "$domain" = "$new_domain_name" ]; then
-				domain_in_search="Yes"
+		for domain in $new_domain_search; do
+			if [ "$domain" = "${new_domain_name}" ] ||
+			if [ "$domain" = "${new_domain_name}" ]; then
+				domain_in_search_list="Yes"
 			fi
 		done
-		if [ ! "$domain_in_search" ]; then
+		if [ -z "$domain_in_search_list" ]; then
 	    		new_domain_search="$new_domain_name $new_domain_search"
 		fi
 	    fi

-- 
ISC DHCP packaging for Debian