8917fba90b
- Update for new upstream release tarball: Pacemaker-2.1.3 for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.3 - get target-by-attribute working again - avoid use-after-free with self-fencing and topology
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From d4bd89fc5ad9eca7949f590843e9557a4b49e906 Mon Sep 17 00:00:00 2001
|
|
From: Ken Gaillot <kgaillot@redhat.com>
|
|
Date: Fri, 3 Jun 2022 08:51:08 -0500
|
|
Subject: [PATCH] Fix: fencer: get target-by-attribute working again
|
|
|
|
Regression in 2.1.3 introduced by b09f16eb1
|
|
|
|
This was papered over by the separate regression in cts-lab introduced by
|
|
4a6d1879, which caused target-by-attribute to no longer be tested, and which
|
|
was recently fixed by caf9a3bc.
|
|
---
|
|
daemons/fenced/fenced_commands.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/daemons/fenced/fenced_commands.c b/daemons/fenced/fenced_commands.c
|
|
index aa070dd..a43a88f 100644
|
|
--- a/daemons/fenced/fenced_commands.c
|
|
+++ b/daemons/fenced/fenced_commands.c
|
|
@@ -1549,7 +1549,7 @@ unpack_level_kind(xmlNode *level)
|
|
}
|
|
if (!stand_alone /* if standalone, there's no attribute manager */
|
|
&& (crm_element_value(level, XML_ATTR_STONITH_TARGET_ATTRIBUTE) != NULL)
|
|
- && (crm_element_value(level, XML_ATTR_STONITH_TARGET_VALUE) == NULL)) {
|
|
+ && (crm_element_value(level, XML_ATTR_STONITH_TARGET_VALUE) != NULL)) {
|
|
return fenced_target_by_attribute;
|
|
}
|
|
return fenced_target_by_unknown;
|
|
--
|
|
1.8.3.1
|
|
|