diff options
| author | Wagner Sartori Junior <wsartori@gmail.com> | 2017-10-12 17:00:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 17:00:47 +0200 |
| commit | 855aab215de7d59ab4156e1865acfac9ccba4aea (patch) | |
| tree | cdc509f64652c5788de9bd1fbec6f1a05118db68 /src/etc/inc/services.inc | |
| parent | 745d37797c62761bcbd08ad607bd9c19cc0e3a64 (diff) | |
| parent | 2448d0fc1fa5642d0d28d37e0398396b07b70de3 (diff) | |
| download | pfsense-855aab215de7d59ab4156e1865acfac9ccba4aea.zip pfsense-855aab215de7d59ab4156e1865acfac9ccba4aea.tar.gz | |
Merge branch 'master' into add-cloudns-to-dynamicdns
Diffstat (limited to 'src/etc/inc/services.inc')
| -rw-r--r-- | src/etc/inc/services.inc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 07d6cac..a19ede0 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -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_interface_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_interface_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'])) { |
