From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 7 Nov 2018 08:45:27 +0000 (+0700)
Subject: [#61,!114] Fixed 2 bugs in kea-admin
X-Git-Tag: 66-authoritative-flag-in-kea_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9d090c3a3863eb8b871fdb9932ce1fcf2520da6;p=thirdparty%2Fkea.git

[#61,!114] Fixed 2 bugs in kea-admin

 Thanks for a patch to lmasarati!
---

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
old mode 100755
new mode 100644
index 2a9d4dccf8..8b24e14d0f
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -22,7 +22,7 @@ mysql_execute() {
         mysql -N -B "$@" -e "${QUERY}"
         retcode=$?
     else
-        mysql -N -B --database="${db_name}" --user="${db_user}" --password="${db_password}" -e "${QUERY}"
+        mysql -N -B --host="${db_host}" --database="${db_name}" --user="${db_user}" --password="${db_password}" -e "${QUERY}"
         retcode=$?
     fi
 
@@ -36,7 +36,7 @@ mysql_execute_script() {
         mysql -N -B "$@" < "${file}"
         retcode=$?
     else
-        mysql -N -B --database="${db_name}" --user="${db_user}" --password="${db_password}" < "${file}"
+        mysql -N -B --host="${db_host}" --database="${db_name}" --user="${db_user}" --password="${db_password}" < "${file}"
         retcode=$?
     fi
 
diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 30c0fcd628..3d391df1a1 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -16,6 +16,7 @@
 
 # Get the location of the kea-admin scripts
 prefix=@prefix@
+export prefix
 SCRIPTS_DIR_DEFAULT=@datarootdir@/@PACKAGE@/scripts
 scripts_dir=${SCRIPTS_DIR_DEFAULT}
 VERSION=@PACKAGE_VERSION@