diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-08 15:02:59 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-08 15:02:59 -0400 |
| commit | 8493104624869b9ea68d5692846e9c695253d10c (patch) | |
| tree | e4bb93d705d4e142df9902ebfa8f0ee02fa8ea0d /etc | |
| parent | 7ff663d3a85cb782489067a6f26be72f4fce4ac3 (diff) | |
| download | pfsense-8493104624869b9ea68d5692846e9c695253d10c.zip pfsense-8493104624869b9ea68d5692846e9c695253d10c.tar.gz | |
Back out duplicated fix from 107e8acc - Ticket #1917 was already fixed before this was added.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 1c07200..91aba0c 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -40,11 +40,6 @@ pfSense_MODULE: utils */ -function strify($str) { - return '"' . $str . '"'; -}; - - /* implement ipv6 route advertising deamon */ function services_radvd_configure() { global $config, $g; @@ -471,11 +466,9 @@ EOPP; $dnscfg .= " option domain-name \"{$dhcpifconf['domain']}\";\n"; } - if($dhcpifconf['domainsearchlist'] <> "") { + if($dhcpifconf['domainsearchlist'] <> "") { $dnscfg .= " option domain-search \"" . join("\",\"", preg_split("/[ ;]+/", $dhcpifconf['domainsearchlist'])) . "\";\n"; - $domains = implode(',', array_map(strify, explode(' ', $dhcpifconf['domainsearchlist']))); - $dnscfg .= " option domain-search {$domains};\n"; - } + } if (isset($dhcpifconf['ddnsupdate'])) { if($dhcpifconf['ddnsdomain'] <> "") { |
