From b80e57d4d74ac8ffac750060e5635d2c608d6b9c Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 8 May 2012 15:05:47 -0400
Subject: Pull in fix for Ticket #1917 to RELENG_2_0 as well.

---
 etc/inc/services.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 883c2b9..9d6b685 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -241,9 +241,9 @@ EOPP;
 			$dnscfg .= "	option domain-name \"{$dhcpifconf['domain']}\";\n";
 		}
 		
-    		if($dhcpifconf['domainsearchlist'] <> "") {
-			$dnscfg .= "	option domain-search-list \"{$dhcpifconf['domainsearchlist']}\";\n";
-    		}
+		if($dhcpifconf['domainsearchlist'] <> "") {
+			$dnscfg .= "	option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpifconf['domainsearchlist'])) . "\";\n";
+		}
 
 		if (isset($dhcpifconf['ddnsupdate'])) {
 			if($dhcpifconf['ddnsdomain'] <> "") {
-- 
cgit v1.1