From: Francis Dupont <fdupont@isc.org>
Date: Fri, 5 Aug 2022 09:51:04 +0000 (+0200)
Subject: [#2071] Check existence of file vs of a parent directory
X-Git-Tag: Kea-2.3.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d43a731e7d3c0ce16af01cd72101e4dd0e893ae4;p=thirdparty%2Fkea.git

[#2071] Check existence of file vs of a parent directory
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 256f86d629..aae0e29ea0 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -48,14 +48,14 @@ dump_file=""
 dump_qry=""
 
 # Include the installed admin-utils.sh if available. Fallback to sources otherwise.
-if test -d "@datarootdir@/@PACKAGE_NAME@"; then
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 else
     . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
 fi
 
 # Find the installed kea-lfc if available. Fallback to sources otherwise.
-if test -d "@sbindir@"; then
+if test -x "@sbindir@/kea-lfc"; then
     kea_lfc="@sbindir@/kea-lfc"
 else
     kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"