[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  4dccf5afa44 ctdb-recovery: Use correct struct ban_node_state type for state
      from  de1fdf1e020 s4:lib:policy: cleanup and handle errors in push_recursive()

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4dccf5afa444edecd2893dac7558bac9212526bf
Author: Christof Schmitt <cs at samba.org>
Date:   Tue May 2 12:17:56 2023 -0700

    ctdb-recovery: Use correct struct ban_node_state type for state
    
    If this codepath is hit, ctdb aborts with:
    
    ctdb/server/ctdb_recovery_helper.c:2687: Type mismatch: name[struct ban_node_state] expected[struct node_ban_state]")
        at ../../lib/talloc/talloc.c:505
    
    Fix this by using the correct type.
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed May  3 08:04:09 UTC 2023 on atb-devel-224

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/ctdb_recovery_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index f3576474144..4df48417c7a 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -2327,8 +2327,8 @@ static void ban_node_done(struct tevent_req *subreq)
 {
 	struct tevent_req *req = tevent_req_callback_data(
 		subreq, struct tevent_req);
-	struct node_ban_state *state = tevent_req_data(
-		req, struct node_ban_state);
+	struct ban_node_state *state = tevent_req_data(
+		req, struct ban_node_state);
 	struct ctdb_reply_control *reply;
 	int ret;
 	bool status;


-- 
Samba Shared Repository