File galera-fix-value-used-for-connecting-with-the-e... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File galera-fix-value-used-for-connecting-with-the-empty-password.patch of Package resource-agents (Revision 133b9db42e372ca17df501f706d43463)

Currently displaying revision 133b9db42e372ca17df501f706d43463 , Show latest

From 03c35aaf202aa2449c57e071609d979d7bf83af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jiri.suchomel@suse.com>
Date: Thu, 2 Apr 2020 11:38:15 +0200
Subject: [PATCH] galera: Fix value used for connecting with the empty
 password.

When check_passwd_use_empty option was introduced, it added a possibility
to connect to mysql explicitly using empty password, thus bypassing defaults
set in ~/.my.cnf.
However the the empty password set for MYSQL_OPTIONS_CHECK variable was wrong,
adding too many levels of escaping and ultimately failing when passed to mysql client.

This commit changes the password value in MYSQL_OPTIONS_CHECK so that it really
ends in passing the empty string.
---
 heartbeat/galera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heartbeat/galera b/heartbeat/galera
index 056281fb8..9c1930fe7 100755
--- a/heartbeat/galera
+++ b/heartbeat/galera
@@ -989,7 +989,7 @@ fi
 MYSQL_OPTIONS_CHECK="-nNE --user=${OCF_RESKEY_check_user}"
 
 if ocf_is_true "${OCF_RESKEY_check_passwd_use_empty}"; then
-    MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=''"
+    MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password="
 elif [ -n "${OCF_RESKEY_check_passwd}" ]; then
     MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${OCF_RESKEY_check_passwd}"
 fi

Places

File galera-fix-value-used-for-connecting-with-the-empty-password.patch of Package resource-agents (Revision 133b9db42e372ca17df501f706d43463)

Places