Project

General

Profile

« Previous | Next » 

Revision b80e57d4

Added by Jim Pingle about 13 years ago

Pull in fix for Ticket #1917 to RELENG_2_0 as well.

View differences:

etc/inc/services.inc
241 241
			$dnscfg .= "	option domain-name \"{$dhcpifconf['domain']}\";\n";
242 242
		}
243 243
		
244
    		if($dhcpifconf['domainsearchlist'] <> "") {
245
			$dnscfg .= "	option domain-search-list \"{$dhcpifconf['domainsearchlist']}\";\n";
246
    		}
244
		if($dhcpifconf['domainsearchlist'] <> "") {
245
			$dnscfg .= "	option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpifconf['domainsearchlist'])) . "\";\n";
246
		}
247 247

  
248 248
		if (isset($dhcpifconf['ddnsupdate'])) {
249 249
			if($dhcpifconf['ddnsdomain'] <> "") {

Also available in: Unified diff