diff options
| author | frank <frankthetank@users.noreply.github.com> | 2017-04-04 22:54:01 -0400 |
|---|---|---|
| committer | frank <frankthetank@users.noreply.github.com> | 2017-04-04 22:54:01 -0400 |
| commit | c00c6f672117d599649c324553e44e64f2d553cc (patch) | |
| tree | 217f7fbb0a474183a8782426468f35ca0ab7f893 /src/etc/inc/services.inc | |
| parent | 499ac3069f503f573b50f09c9c293a7ee6b4f869 (diff) | |
| parent | 593f052172b0969dfe9e9db755a9a41200e67ab1 (diff) | |
| download | pfsense-c00c6f672117d599649c324553e44e64f2d553cc.zip pfsense-c00c6f672117d599649c324553e44e64f2d553cc.tar.gz | |
Merge branch 'master' of https://github.com/pfsense/pfsense into
dyndns_dreamhost
Diffstat (limited to 'src/etc/inc/services.inc')
| -rw-r--r-- | src/etc/inc/services.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index fdf2c8c..5ed626b 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2524,8 +2524,10 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false if (isset($dnsupdate['usepublicip'])) { $wanip = dyndnsCheckIP($if); + $bindip = get_interface_ip($if); } else { $wanip = get_interface_ip($if); + $bindip = $wanip; } $wanipv6 = get_interface_ipv6($if); @@ -2533,7 +2535,10 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false "/dyndns_{$dnsupdate['interface']}_rfc2136_" . escapeshellarg($dnsupdate['host']) . "_{$dnsupdate['server']}.cache"; - $cacheFilev6 = $cacheFile . ".ipv6"; + $cacheFilev6 = $g['conf_path'] . + "/dyndns_{$dnsupdate['interface']}_rfc2136_" . + escapeshellarg($dnsupdate['host']) . + "_{$dnsupdate['server']}_v6.cache"; $currentTime = time(); if (!$wanip && !$wanipv6) { @@ -2617,6 +2622,7 @@ EOD; "{$dnsupdate['host']}. A\n"; $upinst .= "update add {$dnsupdate['host']}. " . "{$dnsupdate['ttl']} A {$wanip}\n"; + $upinst .= "local {$bindip}\n"; $need_update = true; } else { log_error(sprintf(gettext( @@ -2864,6 +2870,8 @@ function install_cron_job($command, $active = false, $minute = "0", $hour = "*", if ($is_installed == true) { unset($config['cron']['item'][$x]); $change_message = "Removed cron job for %s"; + } else { + $cron_changed = false; } } |
