diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-08 15:05:47 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-08 15:05:47 -0400 |
| commit | b80e57d4d74ac8ffac750060e5635d2c608d6b9c (patch) | |
| tree | 0e02c24c31e3e82038686828f75bff94832cb5d0 /etc | |
| parent | 1e476e11c491915103e72c501d70caa5e6883cb9 (diff) | |
| download | pfsense-b80e57d4d74ac8ffac750060e5635d2c608d6b9c.zip pfsense-b80e57d4d74ac8ffac750060e5635d2c608d6b9c.tar.gz | |
Pull in fix for Ticket #1917 to RELENG_2_0 as well.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 6 |
1 files 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'] <> "") { |
