mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3965 from Hobby-Student/master

Browse Source
This commit is contained in:
Steve Beaver 2018-08-22 11:12:40 -04:00
commit cb8443e4f0
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/etc/inc/vpn.inc
View File

@ -527,25 +527,7 @@ EOD;
if (is_array($a_client) && isset($a_client['enable'])) {
$strongswan .= "\t\tattr {\n";
$cfgservers = array();
if (!empty($a_client['dns_server1'])) {
$cfgservers[] = $a_client['dns_server1'];
}
if (!empty($a_client['dns_server2'])) {
$cfgservers[] = $a_client['dns_server2'];
}
if (!empty($a_client['dns_server3'])) {
$cfgservers[] = $a_client['dns_server3'];
}
if (!empty($a_client['dns_server4'])) {
$cfgservers[] = $a_client['dns_server4'];
}
if (!empty($cfgservers)) {
$strongswan .= "\t\t\tdns = " . implode(",", $cfgservers) . "\n";
}
unset($cfgservers);
$cfgservers = array();
if (!empty($a_client['wins_server1'])) {
$cfgservers[] = $a_client['wins_server1'];
@ -1027,6 +1009,7 @@ EOD;
}
$rightsourceip = NULL;
$rightdnsserver = NULL;
if (isset($ph1ent['mobile'])) {
$rightsourceips = array();
if (!empty($a_client['pool_address'])) {
@ -1041,6 +1024,24 @@ EOD;
if (count($rightsourceips)) {
$rightsourceip = "\trightsourceip = " . implode(',', $rightsourceips) . "\n";
}
$rightdnsservers = array();
if (!empty($a_client['dns_server1'])) {
$rightdnsservers[] = $a_client['dns_server1'];
}
if (!empty($a_client['dns_server2'])) {
$rightdnsservers[] = $a_client['dns_server2'];
}
if (!empty($a_client['dns_server3'])) {
$rightdnsservers[] = $a_client['dns_server3'];
}
if (!empty($a_client['dns_server4'])) {
$rightdnsservers[] = $a_client['dns_server4'];
}
if (count($rightdnsservers)) {
$rightdnsserver = "\trightdns = " . implode(',', $rightdnsservers) . "\n";
}
}
if (!empty($ph1ent['caref'])) {
@ -1407,6 +1408,9 @@ EOD;
if (!empty($rightsourceip)) {
$ipsecconnect .= "{$rightsourceip}";
}
if (!empty($rightdnsserver)) {
$ipsecconnect .= "{$rightdnsserver}";
}
if (!empty($ealgosp1)) {
$ipsecconnect .= "\t{$ealgosp1}\n";
}