From: Andrei Pavel <andrei@isc.org>
Date: Tue, 25 Jan 2022 08:08:22 +0000 (+0200)
Subject: [#2225] allow PGPASSWORD to be set from outside admin-utils.sh
X-Git-Tag: Kea-2.1.2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d76bba366ebeddcbf71fdacf3c65b8af0063eed4;p=thirdparty%2Fkea.git

[#2225] allow PGPASSWORD to be set from outside admin-utils.sh
---

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index 91b401286d..7801eae2af 100644
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -135,7 +135,8 @@ pgsql_execute() {
     if test -z "${PGPASSWORD-}"; then
         PGPASSWORD="${db_password}"
     fi
-    export PGPASSWORD="${db_password}"
+    export PGPASSWORD
+
     if [ $# -gt 0 ]; then
         printf '%s' "${QUERY}" | psql --set ON_ERROR_STOP=1 -A -t \
         -h "${db_host}" ${db_port_full_parameter-} -q -U "${db_user}" \
@@ -160,7 +161,8 @@ pgsql_execute_script() {
     if test -z "${PGPASSWORD-}"; then
         PGPASSWORD="${db_password}"
     fi
-    export PGPASSWORD=$db_password
+    export PGPASSWORD
+
     if [ $# -gt 0 ]; then
         psql --set ON_ERROR_STOP=1 -A -t -h "${db_host}" \
         ${db_port_full_parameter-} -q -U "${db_user}" -d "${db_name}" \