diff options
| author | Martin Fuchs <martin.fuchs@trendchiller.com> | 2011-09-30 22:50:05 +0200 |
|---|---|---|
| committer | Martin Fuchs <martin.fuchs@trendchiller.com> | 2011-09-30 22:50:05 +0200 |
| commit | 7833d90adf4996ad3565ca3cf80f5630d6f3da70 (patch) | |
| tree | 77087e8d747bb2052a6a5f923cc2b5a8aa757d5e | |
| parent | 2aae3aff464282d34087b390e89c3163b06badb8 (diff) | |
| parent | 067056363be7abfa95c0873c99347e826a109fc6 (diff) | |
| download | pfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.tar.gz pfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.tar.bz2 pfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | config/unbound/unbound.inc | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc index afb3c0b7..76c35277 100644 --- a/config/unbound/unbound.inc +++ b/config/unbound/unbound.inc @@ -199,8 +199,10 @@ function unbound_control($action) { if(!is_service_running("unbound")) unbound_ctl_exec("start"); /* Link dnsmasq.pid to prevent dhcpleases logging error */ - if (!file_exists("/var/run/dnsmasq.pid")) + if (!is_link("/var/run/dnsmasq.pid")) { + @unlink("/var/run/dnsmasq.pid"); mwexec("/bin/ln -s /var/run/unbound.pid /var/run/dnsmasq.pid"); + } fetch_root_hints(); } break; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 740f634d..461561e6 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1095,7 +1095,7 @@ <descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr> <website>http://www.unbound.net/</website> <category>Services</category> - <version>1.4.13_00</version> + <version>1.4.13_01</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 61b00244..424a9b95 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1080,7 +1080,7 @@ <descr>Unbound is a validating, recursive, and caching DNS resolver. This package is a drop in replacement for Services: DNS Forwarder and also supports DNSSEC extensions. Once installed please configure the Unbound service by visiting Services: Unbound DNS.</descr> <website>http://www.unbound.net/</website> <category>Services</category> - <version>1.4.13_00</version> + <version>1.4.13_01</version> <status>Alpha</status> <maintainer>warren@decoy.co.za</maintainer> <required_version>2.0</required_version> |