From: Francis Dupont <fdupont@isc.org>
Date: Fri, 21 Jan 2022 18:21:56 +0000 (+0100)
Subject: [#2225] Checkpoint: comments addressed but a bug was inherited
X-Git-Tag: Kea-2.1.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc6b3ecb8acbc2a69147c28176f3812fc1bf444;p=thirdparty%2Fkea.git

[#2225] Checkpoint: comments addressed but a bug was inherited
---

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index 7b73a9a559..b82e29b855 100644
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -205,7 +205,7 @@ cql_execute_script() {
     else
         run_command \
             cqlsh -u "${db_user}" -p "${db_password}" -k "${db_name}" \
-            -f "${file}" ${extra_arguments}
+            ${extra_arguments} -f "${file}"
     fi
 
     if [ "${EXIT_CODE}" -ne 0 ]; then
diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 81eb2ed15c..d666cc49da 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -258,8 +258,8 @@ mysql_init() {
 
     printf "Initializing database using script %s\n" $scripts_dir/mysql/dhcpdb_create.mysql
     mysql -B --host="${db_host}" --user="${db_user}" \
-    --password="${db_password}" ${extra_arguments} \
-   "${db_name}" < "${scripts_dir}/mysql/dhcpdb_create.mysql"
+    --password="${db_password}" \
+    "${db_name}" ${extra_arguments} < "${scripts_dir}/mysql/dhcpdb_create.mysql"
 
     printf "mysql returned status code %s\n" "${EXIT_CODE}"
 
@@ -379,7 +379,8 @@ mysql_upgrade() {
     for script in "${scripts_dir}"/mysql/upgrade*.sh
     do
         echo "Processing $script file..."
-        "${script}" --host="${db_host}" --user="${db_user}" --password="${db_password}" "${db_name}"
+        "${script}" --host="${db_host}" --user="${db_user}" \
+        --password="${db_password}" "${db_name} ${extra_arguments}"
     done
 
     printf "Database version reported after upgrade: "
@@ -411,7 +412,8 @@ pgsql_upgrade() {
     for script in "${scripts_dir}"/pgsql/upgrade*.sh
     do
         echo "Processing $script file..."
-        "${script}" -U "${db_user}" -h "${db_host}" -d "${db_name}"
+        "${script}" -U "${db_user}" -h "${db_host}" \
+        -d "${db_name}" ${extra_arguments}
     done
 
     version=$(checked_pgsql_version)
@@ -442,7 +444,8 @@ cql_upgrade() {
         for script in "${scripts_dir}"/cql/upgrade*.sh
         do
             echo "Processing $script file..."
-            "${script}" -u "${db_user}" -p "${db_password}" -k "${db_name}"
+            "${script}" -u "${db_user}" -p "${db_password}" \
+            -k "${db_name}" ${extra_arguments}
         done
     else
         echo "No upgrade script available."