Merge ~cyphermox/ubuntu/+source/isc-dhcp:cyphermox/ubuntu/artful into ~cyphermox/ubuntu/+source/isc-dhcp:ubuntu/artful

[Mathieu Trudel-Lapierre]

diff --git a/debian/changelog b/debian/changelog
index 863c575..16c096a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.3.5-3ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config: fix the
+    logic for handling search domains to also write it to the output file when
+    only the domain name is provided by the DHCP server. Copied code from
+    debian/dhclient-script.linux. (LP: #1713747)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 29 Aug 2017 11:05:01 -0400
+
 isc-dhcp (4.3.5-3ubuntu1) zesty; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config b/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config
index 0cc4401..aab6611 100755
--- a/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config
+++ b/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config
@@ -17,8 +17,22 @@ BOUND)
 	if [ -n "$domain_name"]; then
 		echo "DNSDOMAIN=$new_domain_name" >> /run/net-$interface.conf
 	fi
-	if [ -n "$new_domain_search"]; then
-		echo "DOMAINSEARCH=$new_domain_search" >> /run/net-$interface.conf
+	if [ -n "$new_domain_search" ]; then
+		if [ -n "$new_domain_name" ]; then
+			domain_in_search_list=""
+			for domain in $new_domain_search; do
+				if [ "$domain" = "${new_domain_name}" ] ||
+					[ "$domain" = "${new_domain_name}." ]; then
+					domain_in_search_list="Yes"
+				fi
+			done
+			if [ -z "$domain_in_search_list" ]; then
+				new_domain_search="$new_domain_name $new_domain_search"
+			fi
+		fi
+		echo "DOMAINSEARCH=${new_domain_search}" >> /run/net-$interface.conf
+	elif [ -n "$new_domain_name" ]; then
+		echo "DOMAINSEARCH=${new_domain_name}" >> /run/net-$interface.conf
 	fi
 	;;
 BOUND6)