From: Dirk Brenken <dev@brenken.org>
Date: Thu, 22 Mar 2018 08:19:51 +0000 (+0100)
Subject: luci-base/util.lua: enhance checklib function
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=29d8770983674f161aac390a73b74c3c2318f38f;p=oweals%2Fluci.git

luci-base/util.lua: enhance checklib function

* enhance the checklib function in util.lua to check the 'fullpathexe'
  as well, e.g. this fixes runtime errors on the dhcp/dns template in
  environments without dnsmasq

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/modules/luci-base/luasrc/util.lua b/modules/luci-base/luasrc/util.lua
index 0e7334be8..28c126621 100644
--- a/modules/luci-base/luasrc/util.lua
+++ b/modules/luci-base/luasrc/util.lua
@@ -652,7 +652,8 @@ end
 function checklib(fullpathexe, wantedlib)
 	local fs = require "nixio.fs"
 	local haveldd = fs.access('/usr/bin/ldd')
-	if not haveldd then
+	local haveexe = fs.access(fullpathexe)
+	if not haveldd or not haveexe then
 		return false
 	end
 	local libs = exec("/usr/bin/ldd " .. fullpathexe)