summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2019-11-16 17:39:43 +0100
committerAnsuel Smith <ansuelsmth@gmail.com>2019-11-16 17:39:43 +0100
commitbb7038edb2d0a228546cfb15b24ffeac1978f15f (patch)
tree3e408a6968dc1c7d426eb5e8abe34da5ba9108fc
parent32db039d31f274bfe93a4d7b033c320f781e3c88 (diff)
luci-app-ddns: fix missing check for bindhost
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-rw-r--r--applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns24
1 files changed, 20 insertions, 4 deletions
diff --git a/applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns b/applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns
index 46209b9082..01a9d4c5db 100644
--- a/applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns
+++ b/applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns
@@ -228,12 +228,28 @@ local methods = {
res['has_bindnet'] = has_curl() or has_wgetssl() or false
local function has_bindhost()
- if (sys.call( [[which host >/dev/null 2>&1]] ) == 0) then return true end
- if (sys.call( [[which khost >/dev/null 2>&1]] ) == 0) then return true end
- if (sys.call( [[which drill >/dev/null 2>&1]] ) == 0) then return true end
+ if cache['has_bindhost'] then return cache['has_bindhost'] end
+ local res = (sys.call( [[which host >/dev/null 2>&1]] ) == 0)
+ if res then
+ cache['has_bindhost'] = res
+ return true
+ end
+ res = (sys.call( [[which khost >/dev/null 2>&1]] ) == 0)
+ if res then
+ cache['has_bindhost'] = res
+ return true
+ end
+ res = (sys.call( [[which drill >/dev/null 2>&1]] ) == 0)
+ if res then
+ cache['has_bindhost'] = res
+ return true
+ end
+ cache['has_bindhost'] = false
return false
end
+ res['has_bindhost'] = cache['has_bindhost'] or has_bindhost() or false
+
local function has_hostip()
return (sys.call( [[which hostip >/dev/null 2>&1]] ) == 0)
end
@@ -242,7 +258,7 @@ local methods = {
return (sys.call( [[which nslookup >/dev/null 2>&1]] ) == 0)
end
- res['has_dnsserver'] = has_bindhost() or has_hostip() or has_nslookup() or false
+ res['has_dnsserver'] = cache['has_bindhost'] or has_nslookup() or has_hostip() or has_bindhost() or false
local function check_certs()
local _, v = fs.glob("/etc/ssl/certs/*.crt")