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

Fix #7719

Browse Source 
When Dynamic DNS entry uses a gateway group as interface,
return_gateway_groups_array() will be called and it returns real
interface instead of friendly name, as expected. Take both friendly and
real interface name into consideration.
This commit is contained in:
Renato Botelho 2017-09-11 17:40:09 -03:00
parent 78670b63ce
commit 46583aba3a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/inc/services.inc
View File

@ -1983,14 +1983,19 @@ function services_dyndns_configure($int = "") {
* the active gateway for that group
*/
$group_int = '';
$friendly_group_int = '';
if (is_array($gwgroups[$dyndns['interface']])) {
if (!empty($gwgroups[$dyndns['interface']][0]['vip'])) {
$group_int = $gwgroups[$dyndns['interface']][0]['vip'];
} else {
$group_int = $gwgroups[$dyndns['interface']][0]['int'];
$friendly_group_int =
convert_real_interface_to_friendly_name(
$group_int);
}
}
if ((empty($int)) || ($int == $dyndns['interface']) || ($int == $group_int)) {
if ((empty($int)) || ($int == $dyndns['interface']) ||
($int == $group_int) || ($int == $friendly_group_int)) {
$dyndns['verboselog'] = isset($dyndns['verboselog']);
$dyndns['curl_ipresolve_v4'] = isset($dyndns['curl_ipresolve_v4']);
$dyndns['curl_ssl_verifypeer'] = isset($dyndns['curl_ssl_verifypeer']);
@ -2541,14 +2546,19 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false
* the active gateway for that group
*/
$group_int = '';
$friendly_group_int = '';
if (is_array($gwgroups[$dnsupdate['interface']])) {
if (!empty($gwgroups[$dnsupdate['interface']][0]['vip'])) {
$group_int = $gwgroups[$dnsupdate['interface']][0]['vip'];
} else {
$group_int = $gwgroups[$dnsupdate['interface']][0]['int'];
$friendly_group_int =
convert_real_interface_to_friendly_name(
$group_int);
}
}
if (!empty($int) && ($int != $dnsupdate['interface']) && ($int != $group_int)) {
if (!empty($int) && ($int != $dnsupdate['interface']) &&
($int != $group_int) && ($int != $friendly_group_int)) {
continue;
}
if (!empty($updatehost) && ($updatehost != $dnsupdate['host'])) {