[#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 (executable)
new mode 100644 (file)
index 2a9d4dc..8b24e14
--- 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 30c0fcd6281ee7862c27a80c7cbd2a0a667b30bd..3d391df1a1c52bfa6c0f87d64232f2e88418dd21 100644 (file)
--- 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@