summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-09-27 12:55:02 -0400
committerjim-p <jimp@pfsense.org>2012-09-27 12:55:02 -0400
commit680d543da45c157f47ed007e54f7af08de640a43 (patch)
treeaaf27420d50ec562df569f3a9a073097b1dec2c6
parent7a058f067eb1b7216eace85aa12d2eaaacf443d2 (diff)
downloadpfsense-680d543da45c157f47ed007e54f7af08de640a43.zip
pfsense-680d543da45c157f47ed007e54f7af08de640a43.tar.gz
Add forgotten part of the IPsec split dns fix from yesterday
-rw-r--r--etc/inc/vpn.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 36e1ca9..03941bb 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -390,7 +390,14 @@ function vpn_ipsec_configure($ipchg = false)
if ($a_client['dns_domain']) {
$racoonconf .= "\tdefault_domain \"{$a_client['dns_domain']}\";\n";
- $racoonconf .= "\tsplit_dns \"{$a_client['dns_domain']}\";\n";
+ if (empty($a_client['dns_split']))
+ $racoonconf .= "\tsplit_dns \"{$a_client['dns_domain']}\";\n";
+ }
+
+ if ($a_client['dns_split']) {
+ $domain_array = preg_split("/[ ,]+/",$a_client['dns_split']);
+ $domain_string = implode('", "', $domain_array);
+ $racoonconf .= "\tsplit_dns \"{$domain_string}\";\n";
}
if ($a_client['pfs_group'])
OpenPOWER on IntegriCloud