From 6c4e754e6c5c95a577258b1db9921985ede1757e Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Feb 24 2021 16:08:48 +0000
Subject: Fix: libpacemaker: Pass the correct resource to recursive calls.


Previously, we were just passing the same resource into the recursive
call, which would immediately return due to pe_rscs_allocating being set
on it.  This gets us the recursive output we're expecting.

---

diff --git a/lib/pacemaker/pcmk_output.c b/lib/pacemaker/pcmk_output.c
index b054848..4003b4d 100644
--- a/lib/pacemaker/pcmk_output.c
+++ b/lib/pacemaker/pcmk_output.c
@@ -126,7 +126,7 @@ rsc_is_colocated_with_list(pcmk__output_t *out, va_list args) {
         out->message(out, "locations-list", cons->rsc_rh);
 
         if (recursive) {
-            out->message(out, "rsc-is-colocated-with-list", rsc, recursive);
+            out->message(out, "rsc-is-colocated-with-list", cons->rsc_rh, recursive);
         }
     }
 
@@ -164,7 +164,7 @@ rsc_is_colocated_with_list_xml(pcmk__output_t *out, va_list args) {
         out->message(out, "locations-list", cons->rsc_rh);
 
         if (recursive) {
-            out->message(out, "rsc-is-colocated-with-list", rsc, recursive);
+            out->message(out, "rsc-is-colocated-with-list", cons->rsc_rh, recursive);
         }
     }
 
@@ -196,7 +196,7 @@ rscs_colocated_with_list(pcmk__output_t *out, va_list args) {
         PCMK__OUTPUT_LIST_HEADER(out, FALSE, rc, "Resources colocated with %s", rsc->id);
 
         if (recursive) {
-            out->message(out, "rscs-colocated-with-list", rsc, recursive);
+            out->message(out, "rscs-colocated-with-list", cons->rsc_lh, recursive);
         }
 
         hdr = colocations_header(cons->rsc_lh, cons, TRUE);
@@ -233,7 +233,7 @@ rscs_colocated_with_list_xml(pcmk__output_t *out, va_list args) {
         PCMK__OUTPUT_LIST_HEADER(out, FALSE, rc, "rscs-colocated-with");
 
         if (recursive) {
-            out->message(out, "rscs-colocated-with-list", rsc, recursive);
+            out->message(out, "rscs-colocated-with-list", cons->rsc_lh, recursive);
         }
 
         colocations_xml_node(out, cons->rsc_lh, cons);