openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-04-15 19:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3318 from Ansuel/rework-ddns

Browse Source 
luci-app-ddns: fix missing check for bindhost
This commit is contained in:
Hannu Nyman
2019-11-16 19:20:16 +02:00
committed by GitHub
parent 3b2f05b4b2 bb7038edb2
commit eaa193336f
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/luci-app-ddns/root/usr/libexec/rpcd/luci.ddns
View File

@@ -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")