[SCM] Samba Shared Repository - branch v4-23-test updated

[Jule Anger]

The branch, v4-23-test has been updated
       via  babc0c7cb60 winbind: Initialize idmap in winbindd_getgroups
       via  3749bc3dda3 ctdb: Fix redefinitoin of pmdaResult
      from  c01bad23a82 WHATSNEW: fix typo

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-23-test


- Log -----------------------------------------------------------------
commit babc0c7cb6094459ebb9ba1a722136889601b0ca
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 12 18:19:29 2025 +0200

    winbind: Initialize idmap in winbindd_getgroups
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=15914
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Sat Sep 13 05:44:20 UTC 2025 on atb-devel-224
    
    (cherry picked from commit beaf661b1ec1f048efc8eb2b383fc989a79ae009)
    
    Autobuild-User(v4-23-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-23-test): Wed Sep 17 08:48:10 UTC 2025 on atb-devel-224

commit 3749bc3dda3b1c7941c881f5b5269ea4b8a2d348
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Sep 12 15:37:38 2025 +0200

    ctdb: Fix redefinitoin of pmdaResult
    
    ../../ctdb/utils/pmda/pmda_ctdb.c:52:9: warning: 'pmdaResult' redefined
       52 | #define pmdaResult pmResult
          |         ^~~~~~~~~~
    In file included from ../../ctdb/utils/pmda/pmda_ctdb.c:35:
    /usr/include/pcp/pmda.h:30:9: note: this is the location of the previous definition
       30 | #define pmdaResult pmResult_v2
          |         ^~~~~~~~~~
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15904
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Sat Sep 13 08:12:42 UTC 2025 on atb-devel-224
    
    (cherry picked from commit d4b448c305f674646001e293d8aa6ebc0ca6dc77)

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

Summary of changes:
 ctdb/utils/pmda/pmda_ctdb.c           |  2 +-
 source3/winbindd/winbindd_getgroups.c | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index 9845f26defb..5c09aca7b84 100644
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -48,7 +48,7 @@
 #define pmSetProgname(a)	__pmSetProgname(a)
 #endif
 
-#ifdef HAVE_STRUCT_PMRESULT
+#if !defined(pmdaResult) && defined(HAVE_STRUCT_PMRESULT)
 #define pmdaResult pmResult
 #endif
 
diff --git a/source3/winbindd/winbindd_getgroups.c b/source3/winbindd/winbindd_getgroups.c
index 26933d9d788..2308da20ed3 100644
--- a/source3/winbindd/winbindd_getgroups.c
+++ b/source3/winbindd/winbindd_getgroups.c
@@ -38,6 +38,7 @@ struct winbindd_getgroups_state {
 	gid_t *gids;
 };
 
+static void winbindd_getgroups_idmap_initialized(struct tevent_req *subreq);
 static void winbindd_getgroups_lookupname_done(struct tevent_req *subreq);
 static void winbindd_getgroups_gettoken_done(struct tevent_req *subreq);
 static void winbindd_getgroups_sid2gid_done(struct tevent_req *subreq);
@@ -72,16 +73,40 @@ struct tevent_req *winbindd_getgroups_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
+	subreq = wb_parent_idmap_setup_send(state, state->ev);
+	if (tevent_req_nomem(subreq, req)) {
+		return tevent_req_post(req, ev);
+	}
+	tevent_req_set_callback(subreq,
+				winbindd_getgroups_idmap_initialized,
+				req);
+	return req;
+}
+
+static void winbindd_getgroups_idmap_initialized(struct tevent_req *subreq)
+{
+	struct tevent_req *req = tevent_req_callback_data(subreq,
+							  struct tevent_req);
+	struct winbindd_getgroups_state *state = tevent_req_data(
+		req, struct winbindd_getgroups_state);
+	const struct wb_parent_idmap_config *cfg = NULL;
+	NTSTATUS status;
+
+	status = wb_parent_idmap_setup_recv(subreq, &cfg);
+	TALLOC_FREE(subreq);
+	if (tevent_req_nterror(req, status)) {
+		return;
+	}
+
 	subreq = dcerpc_wbint_NormalizeNameUnmap_send(state,
 						      state->ev,
 						      idmap_child_handle(),
 						      state->request_name,
 						      &state->unmapped_name);
 	if (tevent_req_nomem(subreq, req)) {
-		return tevent_req_post(req, ev);
+		return;
 	}
 	tevent_req_set_callback(subreq, winbindd_getgroups_unmap_done, req);
-	return req;
 }
 
 static void winbindd_getgroups_unmap_done(struct tevent_req *subreq)


-- 
Samba Shared Repository