[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  130283cbae0 s3:winbind: Add additional debug level check to wb_xids2sids_recv()
       via  934bc0c5835 s3:winbind: Fix pointer access in wb_xids2sids_recv()
       via  e824ee6b5ae s3:winbind: Add additional debug level check to wb_lookupusergroups_recv()
       via  450b8da8345 s3:winbind: Fix pointer access in wb_lookupusergroups_recv()
      from  b17cae66e75 s3:winbind: Change max_users, num_users from int to uint32_t in winbindd_getpwent_state

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


- Log -----------------------------------------------------------------
commit 130283cbae0f894cd335875ba10d92ea249259d0
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 18 13:28:50 2022 +0200

    s3:winbind: Add additional debug level check to wb_xids2sids_recv()
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Jul 18 14:44:07 UTC 2022 on sn-devel-184

commit 934bc0c583534884d1d56e3538c27b5102b869e7
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 18 09:20:22 2022 +0200

    s3:winbind: Fix pointer access in wb_xids2sids_recv()
    
    CID 1507348
    CID 1507349
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit e824ee6b5aed6fb5b1d251598e0357aacb2b143c
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 18 13:26:58 2022 +0200

    s3:winbind: Add additional debug level check to wb_lookupusergroups_recv()
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 450b8da8345303b6b4458e412cfd9e6f5cd5d132
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 18 09:18:59 2022 +0200

    s3:winbind: Fix pointer access in wb_lookupusergroups_recv()
    
    Fixes CID 1507350
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/winbindd/wb_lookupusergroups.c |  8 +++++---
 source3/winbindd/wb_xids2sids.c        | 14 ++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index 3ec25b49393..c4ac1be8078 100644
--- a/source3/winbindd/wb_lookupusergroups.c
+++ b/source3/winbindd/wb_lookupusergroups.c
@@ -109,9 +109,11 @@ NTSTATUS wb_lookupusergroups_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 
 	D_INFO("WB command lookupusergroups end.\nReceived %u SID(s).\n",
 	       *num_sids);
-	for (i = 0; i < *num_sids; i++) {
-		struct dom_sid_buf buf;
-		D_INFO("%u: %s\n", i, dom_sid_str_buf(&*sids[i], &buf));
+	if (CHECK_DEBUGLVL(DBGLVL_INFO)) {
+		for (i = 0; i < *num_sids; i++) {
+			struct dom_sid_buf buf;
+			D_INFO("%u: %s\n", i, dom_sid_str_buf(&((*sids)[i]), &buf));
+		}
 	}
 	return NT_STATUS_OK;
 }
diff --git a/source3/winbindd/wb_xids2sids.c b/source3/winbindd/wb_xids2sids.c
index 17e612b7368..c873cc2443b 100644
--- a/source3/winbindd/wb_xids2sids.c
+++ b/source3/winbindd/wb_xids2sids.c
@@ -404,12 +404,14 @@ NTSTATUS wb_xids2sids_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 	}
 
 	*sids = talloc_move(mem_ctx, &state->sids);
-	for (i = 0; i <  state->num_xids; i++) {
-		struct dom_sid_buf buf;
-		D_INFO("%lu: XID %u mapped to SID %s\n",
-		       i,
-		       state->xids[i].id,
-		       dom_sid_str_buf(&*sids[i], &buf));
+	if (CHECK_DEBUGLVL(DBGLVL_INFO)) {
+		for (i = 0; i <  state->num_xids; i++) {
+			struct dom_sid_buf buf;
+			D_INFO("%lu: XID %u mapped to SID %s\n",
+			       i,
+			       state->xids[i].id,
+			       dom_sid_str_buf(&((*sids)[i]), &buf));
+		}
 	}
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository