diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-07-13 20:20:30 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-07-13 20:20:30 -0500 |
| commit | 3f78716f7ec83ba25ea623588dc8788de51b5ca9 (patch) | |
| tree | 205b07a73c28e430e5a8bf536b4da26585eaeff8 | |
| parent | 2c68b4b20bc0709ec485f0292648b50aff3ad098 (diff) | |
| parent | 880872c7321eddfd1344d1843c7d92d2334b45de (diff) | |
| download | pfsense-packages-3f78716f7ec83ba25ea623588dc8788de51b5ca9.tar.gz pfsense-packages-3f78716f7ec83ba25ea623588dc8788de51b5ca9.tar.bz2 pfsense-packages-3f78716f7ec83ba25ea623588dc8788de51b5ca9.zip | |
Merge pull request #899 from doktornotor/patch-4
| -rw-r--r-- | config/tinydns/tinydns.inc | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc index 047383ff..5effa10c 100644 --- a/config/tinydns/tinydns.inc +++ b/config/tinydns/tinydns.inc @@ -1163,7 +1163,7 @@ function tinydns_dnscache_forwarding_servers($index) { exec("rm -R {$g['varetc_path']}/dnscache/root/servers/"); exec("/bin/mkdir -p {$g['varetc_path']}/dnscache{$index}/root/servers/"); if (intval($config['version']) >= 6) - if (file_exists("{$g['varetc_path']}/nameserver_*")) { + if (!empty(glob("{$g['varetc_path']}/nameserver_*"))) { exec("/bin/cat {$g['varetc_path']}/nameserver_* > {$g['varetc_path']}/dnscache{$index}/root/servers/@"); } else { $fw = fopen("{$g['varetc_path']}/dnscache{$index}/root/servers/@", "w"); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 59ccb704..c164d923 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -686,7 +686,7 @@ <descr>pfSense version of TinyDNS which features failover host support</descr> <website>http://cr.yp.to/djbdns.html</website> <category>Services</category> - <version>1.0.6.21</version> + <version>1.0.6.22</version> <status>Beta</status> <pkginfolink>https://doc.pfsense.org/index.php/Tinydns_package</pkginfolink> <required_version>2.2</required_version> |