The branch, master has been updated via 1a897f1b718 s3:winbind: Add additional debug level check to wb_lookupsids_send() via a2f30eede44 s3:winbind: Add additional debug level check to winbindd_getsidaliases_send() via 47c48fd0203 s3:winbind: Add additional debug level check to winbindd_getgroups_recv() via 4a61e6dc537 s3:winbind: Add additional debug level check to wb_gettoken_recv() via 213570a0dd3 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getsidaliases.c via aa5ddc23adb s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_xids_to_sids.c via 1b6b6f7d8a3 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_sids_to_xids.c via 189f5790c02 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_list_users.c via 9873b4fd0af s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_list_groups.c via 1ff8bbd2975 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getusersids.c via 98b1f42a97d s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getuserdomgroups.c via fb4f1e37176 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getpwent.c via ec8b50e0491 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgroups.c via 23b0842b638 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrnam.c via 0086ce11dee s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrgid.c via cd49a22c681 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrent.c via 37a1c25d36c s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupsids.c via 75c901024f3 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_xids2sids.c via 7e715ed0bbf s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_sids2xids.c via 98c678321ba s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_queryuser.c via 473ed0a52f1 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_query_user_list.c via 55510a931e4 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_query_group_list.c via d2eb6404a15 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_next_pwent.c via 547b51935c9 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupusergroups.c via 6aded17131f s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupuseraliases.c via 892975dab71 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_group_members.c via 7736ac45a47 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_gettoken.c via e01b9f11ada README.Coding: PRINT format specifiers PRIuxx from 3d95220a571 Add a .clang-format file
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1a897f1b718493a0b78154ef5214dc0d298fcd98 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Add additional debug level check to wb_lookupsids_send() Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jul 21 14:41:53 UTC 2022 on sn-devel-184 commit a2f30eede44dddbec24509930cc959e7c04172b6 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Tue Jul 19 16:25:13 2022 +0200 s3:winbind: Add additional debug level check to winbindd_getsidaliases_send() Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 47c48fd020395181e048bdfd47e7c96623ba6793 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Tue Jul 19 16:21:57 2022 +0200 s3:winbind: Add additional debug level check to winbindd_getgroups_recv() Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 4a61e6dc537b064e629e6d9b2c8cf1feca16abcf Author: Pavel Filipenský <pfilipen...@samba.org> Date: Tue Jul 19 16:48:09 2022 +0200 s3:winbind: Add additional debug level check to wb_gettoken_recv() Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 213570a0dd3269ef46ff55effff2df1e9bd2a707 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getsidaliases.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit aa5ddc23adbe60b32852e76d8c7167c0e45c03da Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_xids_to_sids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 1b6b6f7d8a301c34bc7ba4f4b935a11f7edcaa73 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_sids_to_xids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 189f5790c02e110b9b172e9a8d3426fa8c898067 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_list_users.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 9873b4fd0af05fdc8995de3b0588004b79a306bd Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_list_groups.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 1ff8bbd2975f02304cf4f005872611bd21564af0 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getusersids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 98b1f42a97d839027bed77dcf269f9281bf1f4b7 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getuserdomgroups.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit fb4f1e371762f8409a033f44016183e15c242956 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getpwent.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit ec8b50e049142905f0cd963c18274233780b64c7 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgroups.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 23b0842b6388354b71a4f678b5697eee1a7777d2 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:11 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrnam.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 0086ce11dee7c836743e08ab601d57ba4157dd35 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrgid.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit cd49a22c681ddfb68e2e52dca8ae39e0d5baa7d4 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in winbindd_getgrent.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 37a1c25d36cd411904a7fbb8cbe45df9e2db4b33 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupsids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 75c901024f3e53db0533c2ca954ba0f3bf09e3d2 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Tue Jul 19 11:11:53 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_xids2sids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 7e715ed0bbf305cd9289b3240b71254cd8538b4e Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_sids2xids.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 98c678321bac56edae4a0f9ebe997cca9af4fd0f Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_queryuser.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 473ed0a52f15b3e9d50d3a8c21b1a133b2bb21e9 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_query_user_list.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 55510a931e4c89a5fefc3155a991705d8911581b Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_query_group_list.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit d2eb6404a159d8d6a8ca430686806a760eb6c525 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_next_pwent.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 547b51935c94d8618d700a8b50d3ad801905e0d9 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupusergroups.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 6aded17131f3bf79e2192d2d7ecf246d1b7e54b1 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_lookupuseraliases.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 892975dab716ff2def78262d496899d6b7e627f3 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_group_members.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 7736ac45a47bec8cd21c14c5171b0784a379a760 Author: Pavel Filipenský <pfilipen...@samba.org> Date: Mon Jul 18 15:28:10 2022 +0200 s3:winbind: Change '%u' to '%PRIu32' for uint32_t in wb_gettoken.c Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit e01b9f11ada633ef233fa1e0f52d77f8c105148d Author: Pavel Filipenský <pfilipen...@samba.org> Date: Tue Jul 19 11:46:13 2022 +0200 README.Coding: PRINT format specifiers PRIuxx Signed-off-by: Pavel Filipenský <pfilipen...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: README.Coding.md | 23 +++++++++++++++++ source3/winbindd/wb_gettoken.c | 37 ++++++++++++++++++---------- source3/winbindd/wb_group_members.c | 4 +-- source3/winbindd/wb_lookupsids.c | 18 ++++++++------ source3/winbindd/wb_lookupuseraliases.c | 10 ++++---- source3/winbindd/wb_lookupusergroups.c | 5 ++-- source3/winbindd/wb_next_pwent.c | 2 +- source3/winbindd/wb_query_group_list.c | 2 +- source3/winbindd/wb_query_user_list.c | 7 +++--- source3/winbindd/wb_queryuser.c | 4 +-- source3/winbindd/wb_sids2xids.c | 32 +++++++++++++----------- source3/winbindd/wb_xids2sids.c | 19 ++++++++------ source3/winbindd/winbindd_getgrent.c | 8 +++--- source3/winbindd/winbindd_getgrgid.c | 2 +- source3/winbindd/winbindd_getgrnam.c | 2 +- source3/winbindd/winbindd_getgroups.c | 10 +++++--- source3/winbindd/winbindd_getpwent.c | 8 +++--- source3/winbindd/winbindd_getsidaliases.c | 13 ++++++---- source3/winbindd/winbindd_getuserdomgroups.c | 5 ++-- source3/winbindd/winbindd_getusersids.c | 6 +++-- source3/winbindd/winbindd_list_groups.c | 4 +-- source3/winbindd/winbindd_list_users.c | 2 +- source3/winbindd/winbindd_sids_to_xids.c | 2 +- source3/winbindd/winbindd_xids_to_sids.c | 2 +- 24 files changed, 141 insertions(+), 86 deletions(-) Changeset truncated at 500 lines: diff --git a/README.Coding.md b/README.Coding.md index 09a13283e05..7aaf56a44ea 100644 --- a/README.Coding.md +++ b/README.Coding.md @@ -555,3 +555,26 @@ DBG_DEBUG("Received %d bytes\n", count); The messages from these macros are automatically prefixed with the function name. + + + +### PRINT format specifiers PRIuxx + +Use %PRIu32 instead of %u for uint32_t. Do not assume that this is valid: + +/usr/include/inttypes.h +104:# define PRIu32 "u" + +It could be possible to have a platform where "unsigned" is 64-bit. In theory +even 16-bit. The point is that "unsigned" being 32-bit is nowhere specified. +The PRIuxx specifiers are standard. + +Example usage: + +``` +D_DEBUG("Resolving %"PRIu32" SID(s).\n", state->num_sids); +``` + +Note: + +Do not use PRIu32 for uid_t and gid_t, they do not have to be uint32_t. diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c index dd8f0d37e71..3930f71d98d 100644 --- a/source3/winbindd/wb_gettoken.c +++ b/source3/winbindd/wb_gettoken.c @@ -127,7 +127,7 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq) return; } - D_DEBUG("Received %u group(s).\n", num_groups); + D_DEBUG("Received %"PRIu32" group(s).\n", num_groups); for (i = 0; i < num_groups; i++) { D_DEBUG("Adding SID %s.\n", dom_sid_str_buf(&groups[i], &buf)); status = add_sid_to_array_unique( @@ -153,7 +153,8 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq) return; } - D_DEBUG("Expand domain's aliases for %u SID(s).\n", state->num_sids); + D_DEBUG("Expand domain's aliases for %"PRIu32" SID(s).\n", + state->num_sids); subreq = wb_lookupuseraliases_send(state, state->ev, domain, state->num_sids, state->sids); if (tevent_req_nomem(subreq, req)) { @@ -179,7 +180,7 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req *subreq) return; } - D_DEBUG("Got %u RID(s).\n", num_rids); + D_DEBUG("Got %"PRIu32" RID(s).\n", num_rids); status = wb_add_rids_to_sids(state, &state->num_sids, &state->sids, get_global_sam_sid(), num_rids, rids); if (tevent_req_nterror(req, status)) { @@ -191,7 +192,8 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req *subreq) * Now expand the builtin groups */ - D_DEBUG("Expand the builtin groups for %u SID(s).\n", state->num_sids); + D_DEBUG("Expand the builtin groups for %"PRIu32" SID(s).\n", + state->num_sids); domain = find_domain_from_sid(&global_sid_Builtin); if (domain == NULL) { tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR); @@ -221,7 +223,7 @@ static void wb_gettoken_gotbuiltins(struct tevent_req *subreq) if (tevent_req_nterror(req, status)) { return; } - D_DEBUG("Got %u RID(s).\n", num_rids); + D_DEBUG("Got %"PRIu32" RID(s).\n", num_rids); status = wb_add_rids_to_sids(state, &state->num_sids, &state->sids, &global_sid_Builtin, num_rids, rids); if (tevent_req_nterror(req, status)) { @@ -242,10 +244,17 @@ NTSTATUS wb_gettoken_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, return status; } *num_sids = state->num_sids; - D_INFO("WB command gettoken end.\nReceived %u SID(s).\n", state->num_sids); - for (i = 0; i < state->num_sids; i++) { - struct dom_sid_buf sidbuf; - D_INFO("%u: %s\n", i, dom_sid_str_buf(&state->sids[i], &sidbuf)); + D_INFO("WB command gettoken end.\nReceived %"PRIu32" SID(s).\n", + state->num_sids); + + if (CHECK_DEBUGLVL(DBGLVL_INFO)) { + for (i = 0; i < state->num_sids; i++) { + struct dom_sid_buf sidbuf; + D_INFO("%"PRIu32": %s\n", + i, + dom_sid_str_buf(&state->sids[i], + &sidbuf)); + } } *sids = talloc_move(mem_ctx, &state->sids); @@ -259,21 +268,23 @@ static NTSTATUS wb_add_rids_to_sids(TALLOC_CTX *mem_ctx, uint32_t num_rids, uint32_t *rids) { uint32_t i; - D_DEBUG("%u SID(s) will be uniquely added to the SID array.\n" - "Before the addition the array has %u SID(s).\n", + + D_DEBUG("%"PRIu32" SID(s) will be uniquely added to the SID array.\n" + "Before the addition the array has %"PRIu32" SID(s).\n", num_rids, *pnum_sids); + for (i = 0; i < num_rids; i++) { NTSTATUS status; struct dom_sid sid; sid_compose(&sid, domain_sid, rids[i]); - status = add_sid_to_array_unique( mem_ctx, &sid, psids, pnum_sids); if (!NT_STATUS_IS_OK(status)) { return status; } } - D_DEBUG("After the addition the array has %u SID(s).\n", *pnum_sids); + D_DEBUG("After the addition the array has %"PRIu32" SID(s).\n", + *pnum_sids); return NT_STATUS_OK; } diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index cb093ed2263..65ae4271d57 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -157,7 +157,7 @@ static struct tevent_req *wb_groups_members_send(TALLOC_CTX *mem_ctx, state->next_group = 0; state->all_members = NULL; - D_DEBUG("Looking up %u group(s).\n", num_groups); + D_DEBUG("Looking up %"PRIu32" group(s).\n", num_groups); status = wb_groups_members_next_subreq(state, state, &subreq); if (tevent_req_nterror(req, status)) { return tevent_req_post(req, ev); @@ -223,7 +223,7 @@ static void wb_groups_members_done(struct tevent_req *subreq) num_all_members = talloc_array_length(state->all_members); - D_DEBUG("Adding %u new member(s) to existing %u member(s)\n", + D_DEBUG("Adding %"PRIu32" new member(s) to existing %"PRIu32" member(s)\n", num_members, num_all_members); diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c index 17f562db030..d0259119731 100644 --- a/source3/winbindd/wb_lookupsids.c +++ b/source3/winbindd/wb_lookupsids.c @@ -116,10 +116,14 @@ struct tevent_req *wb_lookupsids_send(TALLOC_CTX *mem_ctx, struct wb_lookupsids_state *state; uint32_t i; - D_INFO("WB command lookupsids start.\nLooking up %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)); + D_INFO("WB command lookupsids start.\nLooking up %"PRIu32" SID(s)\n", + num_sids); + if (CHECK_DEBUGLVL(DBGLVL_INFO)) { + for (i = 0; i < num_sids; i++) { + struct dom_sid_buf buf; + D_INFO("%"PRIu32": %s\n", + i, dom_sid_str_buf(&sids[i], &buf)); + } } req = tevent_req_create(mem_ctx, &state, struct wb_lookupsids_state); if (req == NULL) { @@ -338,7 +342,7 @@ static struct wb_lookupsids_domain *wb_lookupsids_get_domain( return NULL; } - D_DEBUG("Searching %u domain(s) for domain '%s'\n", + D_DEBUG("Searching %"PRIu32" domain(s) for domain '%s'\n", num_domains, wb_domain->name); for (i=0; i<num_domains; i++) { if (domains[i].domain != wb_domain) { @@ -669,7 +673,7 @@ NTSTATUS wb_lookupsids_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, * if not we have a bug in the code! */ if (state->res_names->count != state->num_sids) { - D_WARNING("Got %u returned name(s), but expected %u!\n", + D_WARNING("Got %"PRIu32" returned name(s), but expected %"PRIu32"!\n", state->res_names->count, state->num_sids); return NT_STATUS_INTERNAL_ERROR; } @@ -686,7 +690,7 @@ NTSTATUS wb_lookupsids_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, *domains = talloc_move(mem_ctx, &state->res_domains); *names = talloc_move(mem_ctx, &state->res_names); - D_INFO("Returning %u domain(s) and %u name(s).\n", + D_INFO("Returning %"PRIu32" domain(s) and %"PRIu32" name(s).\n", (*domains)->count, (*names)->count); return NT_STATUS_OK; diff --git a/source3/winbindd/wb_lookupuseraliases.c b/source3/winbindd/wb_lookupuseraliases.c index 4517e066df9..a9ad7d4ff45 100644 --- a/source3/winbindd/wb_lookupuseraliases.c +++ b/source3/winbindd/wb_lookupuseraliases.c @@ -47,12 +47,12 @@ struct tevent_req *wb_lookupuseraliases_send(TALLOC_CTX *mem_ctx, } D_INFO("WB command lookupuseraliases start.\n" - "Query domain %s for max %u SID(s).\n", + "Query domain %s for max %"PRIu32" SID(s).\n", domain->name, num_sids); for (i = 0; i < num_sids; i++) { struct dom_sid_buf buf; - D_INFO("%u: SID %s\n", i, dom_sid_str_buf(&sids[i], &buf)); + D_INFO("%"PRIu32": SID %s\n", i, dom_sid_str_buf(&sids[i], &buf)); } state->sids.num_sids = num_sids; state->sids.sids = discard_const_p(struct dom_sid, sids); @@ -91,16 +91,16 @@ NTSTATUS wb_lookupuseraliases_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, struct wb_lookupuseraliases_state *state = tevent_req_data( req, struct wb_lookupuseraliases_state); NTSTATUS status; - int i; + uint32_t i; if (tevent_req_is_nterror(req, &status)) { return status; } *num_aliases = state->rids.num_rids; - D_INFO("WB command lookupuseraliases end.\nGot %u alias(es):\n", + D_INFO("WB command lookupuseraliases end.\nGot %"PRIu32" alias(es):\n", *num_aliases); for (i = 0; i < *num_aliases; i++) { - D_INFO("%u: RID %u\n", i, state->rids.rids[i]); + D_INFO("%"PRIu32": RID %"PRIu32"\n", i, state->rids.rids[i]); } *aliases = talloc_move(mem_ctx, &state->rids.rids); diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c index c4ac1be8078..7ac1b6e03d2 100644 --- a/source3/winbindd/wb_lookupusergroups.c +++ b/source3/winbindd/wb_lookupusergroups.c @@ -107,12 +107,13 @@ NTSTATUS wb_lookupusergroups_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, *num_sids = state->sids.num_sids; *sids = talloc_move(mem_ctx, &state->sids.sids); - D_INFO("WB command lookupusergroups end.\nReceived %u SID(s).\n", + D_INFO("WB command lookupusergroups end.\nReceived %"PRIu32" SID(s).\n", *num_sids); 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)); + D_INFO("%"PRIu32": %s\n", + i, dom_sid_str_buf(&*sids[i], &buf)); } } return NT_STATUS_OK; diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c index 657fe89d04a..f000c64a17e 100644 --- a/source3/winbindd/wb_next_pwent.c +++ b/source3/winbindd/wb_next_pwent.c @@ -66,7 +66,7 @@ static void wb_next_pwent_send_do(struct tevent_req *req, sid_compose(&state->next_sid, &state->gstate->domain->sid, state->gstate->rids.rids[state->gstate->next_user]); - D_DEBUG("Get pw for SID %s composed from domain SID %s and RID %u.\n", + D_DEBUG("Get pw for SID %s composed from domain SID %s and RID %"PRIu32".\n", dom_sid_str_buf(&state->next_sid, &buf), dom_sid_str_buf(&state->gstate->domain->sid, &buf1), state->gstate->rids.rids[state->gstate->next_user]); diff --git a/source3/winbindd/wb_query_group_list.c b/source3/winbindd/wb_query_group_list.c index e7c1f734e09..a71e162c7fe 100644 --- a/source3/winbindd/wb_query_group_list.c +++ b/source3/winbindd/wb_query_group_list.c @@ -89,6 +89,6 @@ NTSTATUS wb_query_group_list_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, *groups = talloc_move(mem_ctx, &state->groups.principals); D_INFO("WB command group_list end.\n" - "Returning %u group(s).\n", *num_groups); + "Returning %"PRIu32" group(s).\n", *num_groups); return NT_STATUS_OK; } diff --git a/source3/winbindd/wb_query_user_list.c b/source3/winbindd/wb_query_user_list.c index 772d795f1c3..451ac6b5547 100644 --- a/source3/winbindd/wb_query_user_list.c +++ b/source3/winbindd/wb_query_user_list.c @@ -76,7 +76,7 @@ static void wb_query_user_list_gotrids(struct tevent_req *subreq) return; } - D_DEBUG("dcerpc_wbint_QueryUserList returned %u users\n", + D_DEBUG("dcerpc_wbint_QueryUserList returned %"PRIu32" users\n", state->rids.num_rids); subreq = dcerpc_wbint_LookupRids_send( @@ -104,7 +104,8 @@ static void wb_query_user_list_done(struct tevent_req *subreq) tevent_req_nterror(req, status); return; } - D_DEBUG("Processing %u principal(s).\n", state->names.num_principals); + D_DEBUG("Processing %"PRIu32" principal(s).\n", + state->names.num_principals); for (i=0; i<state->names.num_principals; i++) { struct wbint_Principal *p = &state->names.principals[i]; const char *name; @@ -120,7 +121,7 @@ static void wb_query_user_list_done(struct tevent_req *subreq) tevent_req_nterror(req, map_nt_error_from_unix(ret)); return; } - D_DEBUG("%u: Adding user %s\n", i, name); + D_DEBUG("%"PRIu32": Adding user %s\n", i, name); } tevent_req_done(req); diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c index 8215adb8298..c079cbcfd90 100644 --- a/source3/winbindd/wb_queryuser.c +++ b/source3/winbindd/wb_queryuser.c @@ -131,7 +131,7 @@ static void wb_queryuser_got_uid(struct tevent_req *subreq) return; } - D_DEBUG("Received XID %u for SID %s.\n", + D_DEBUG("Received XID %"PRIu32" for SID %s.\n", xid.id, dom_sid_str_buf(&info->user_sid, &buf1)); info->uid = xid.id; @@ -397,7 +397,7 @@ static void wb_queryuser_got_gid(struct tevent_req *subreq) return; } - D_DEBUG("Got XID %u with type %d.\n", xid.id, xid.type); + D_DEBUG("Got XID %"PRIu32" with type %d.\n", xid.id, xid.type); if ((xid.type != ID_TYPE_GID) && (xid.type != ID_TYPE_BOTH)) { D_WARNING("Returning NT_STATUS_NO_SUCH_USER\n" "xid.type must be ID_TYPE_UID or ID_TYPE_BOTH.\n"); diff --git a/source3/winbindd/wb_sids2xids.c b/source3/winbindd/wb_sids2xids.c index cd5e4542d96..179a51f81e4 100644 --- a/source3/winbindd/wb_sids2xids.c +++ b/source3/winbindd/wb_sids2xids.c @@ -82,7 +82,7 @@ struct tevent_req *wb_sids2xids_send(TALLOC_CTX *mem_ctx, uint32_t num_valid = 0; D_INFO("WB command sids2xids start.\n" - "Resolving %u SID(s).\n", num_sids); + "Resolving %"PRIu32" SID(s).\n", num_sids); req = tevent_req_create(mem_ctx, &state, struct wb_sids2xids_state); @@ -153,8 +153,8 @@ struct tevent_req *wb_sids2xids_send(TALLOC_CTX *mem_ctx, }, }; - D_DEBUG("SID %u: %s\n", - (int)i, dom_sid_str_buf(&state->sids[i], &buf)); + D_DEBUG("%"PRIu32": SID %s\n", + i, dom_sid_str_buf(&state->sids[i], &buf)); in_cache = wb_sids2xids_in_cache(&state->sids[i], &map); if (in_cache) { @@ -172,7 +172,8 @@ struct tevent_req *wb_sids2xids_send(TALLOC_CTX *mem_ctx, } } - D_DEBUG("Found %u (out of %u) SID(s) in cache.\n", num_valid, num_sids); + D_DEBUG("Found %"PRIu32" (out of %"PRIu32") SID(s) in cache.\n", + num_valid, num_sids); if (num_valid == num_sids) { tevent_req_done(req); return tevent_req_post(req, ev); @@ -202,7 +203,7 @@ static void wb_sids2xids_idmap_setup_done(struct tevent_req *subreq) return; } SMB_ASSERT(state->cfg->num_doms > 0); - D_DEBUG("We will loop over %u SID(s) (skipping those already resolved via cache) and over %u domain(s).\n", + D_DEBUG("We will loop over %"PRIu32" SID(s) (skipping those already resolved via cache) and over %"PRIu32" domain(s).\n", state->num_sids, state->cfg->num_doms); @@ -219,12 +220,12 @@ static void wb_sids2xids_idmap_setup_done(struct tevent_req *subreq) uint32_t di; struct dom_sid_buf buf0, buf1; - D_DEBUG("%u: Processing SID %s\n", + D_DEBUG("%"PRIu32": Processing SID %s\n", i, dom_sid_str_buf(&state->sids[i], &buf0)); if (t->domain_index == UINT32_MAX) { /* ignore already filled entries */ - D_DEBUG("Ignoring already resolved SID %u: %s\n", + D_DEBUG("%"PRIu32": Ignoring already resolved SID %s\n", i, dom_sid_str_buf(&state->sids[i], &buf0)); continue; @@ -232,7 +233,7 @@ static void wb_sids2xids_idmap_setup_done(struct tevent_req *subreq) sid_copy(&domain_sid, &state->sids[i]); sid_split_rid(&domain_sid, &rid); - D_DEBUG("%u: Splitted SID %s into domain SID %s and RID %u\n", + D_DEBUG("%"PRIu32": Splitted SID %s into domain SID %s and RID %"PRIu32"\n", i, dom_sid_str_buf(&state->sids[i], &buf0), dom_sid_str_buf(&domain_sid, &buf1), @@ -259,7 +260,7 @@ static void wb_sids2xids_idmap_setup_done(struct tevent_req *subreq) } } - D_DEBUG("Looping over %u domain(s) to find domain SID %s.\n", + D_DEBUG("Looping over %"PRIu32" domain(s) to find domain SID %s.\n", state->cfg->num_doms, dom_sid_str_buf(&domain_sid, &buf0)); for (di = 0; di < state->cfg->num_doms; di++) { @@ -466,7 +467,7 @@ static void wb_sids2xids_next_sids2unix(struct tevent_req *req) next_domain: state->tried_dclookup = false; - D_DEBUG("Processing next domain (dom_index=%u, idmap_doms.count=%u, lookup_count=%u).\n", + D_DEBUG("Processing next domain (dom_index=%"PRIu32", idmap_doms.count=%"PRIu32", lookup_count=%"PRIu32").\n", state->dom_index, state->idmap_doms.count, state->lookup_count); @@ -495,7 +496,7 @@ static void wb_sids2xids_next_sids2unix(struct tevent_req *req) state->lookup_count += 1; } - D_DEBUG("Prepared %u SID(s) for lookup wb_lookupsids_send().\n", + D_DEBUG("Prepared %"PRIu32" SID(s) for lookup wb_lookupsids_send().\n", state->lookup_count); if (state->lookup_count == 0) { /* @@ -674,7 +675,8 @@ static void wb_sids2xids_done(struct tevent_req *subreq) if (src->ids[si].xid.type != ID_TYPE_NOT_SPECIFIED) { dst->ids[di].xid = src->ids[si].xid; - D_DEBUG("%u: Setting XID %u\n", si, src->ids[si].xid.id); + D_DEBUG("%"PRIu32": Setting XID %"PRIu32"\n", + si, src->ids[si].xid.id); } dst->ids[di].domain_index = UINT32_MAX; /* mark as valid */ idmap_cache_set_sid2unixid(&state->sids[di], &dst->ids[di].xid); @@ -765,8 +767,8 @@ NTSTATUS wb_sids2xids_recv(struct tevent_req *req, } if (num_xids != state->num_sids) { - D_WARNING("Error. We have resolved only %u XID(s), but caller asked for %u.\n", - (unsigned)state->num_sids, num_xids); + D_WARNING("Error. We have resolved only %"PRIu32" XID(s), but caller asked for %"PRIu32".\n", + state->num_sids, num_xids); return NT_STATUS_INTERNAL_ERROR; } @@ -774,7 +776,7 @@ NTSTATUS wb_sids2xids_recv(struct tevent_req *req, for (i=0; i<state->num_sids; i++) { struct dom_sid_buf buf; xids[i] = state->all_ids.ids[i].xid; - D_INFO("%u: Found XID %u for SID %s\n", + D_INFO("%"PRIu32": Found XID %"PRIu32" for SID %s\n", i, xids[i].id, dom_sid_str_buf(&state->sids[i], &buf)); diff --git a/source3/winbindd/wb_xids2sids.c b/source3/winbindd/wb_xids2sids.c index c873cc2443b..48faa21810d 100644 --- a/source3/winbindd/wb_xids2sids.c +++ b/source3/winbindd/wb_xids2sids.c @@ -86,20 +86,24 @@ static struct tevent_req *wb_xids2sids_dom_send( if ((id.id < dom_map->low_id) || (id.id > dom_map->high_id)) { /* out of range */ - D_DEBUG("%lu: XID %u is out of range.\n", i, id.id); + D_DEBUG("%lu: XID %"PRIu32" is out of range.\n", + i, id.id); continue; } if (state->cached[i]) { /* already found in cache */ - D_DEBUG("%lu: XID %u is already found in cache.\n", i, id.id); + D_DEBUG("%lu: XID %"PRIu32" is already found in cache.\n", + i, id.id); continue; } if (!is_null_sid(&state->all_sids[i])) { /* already mapped in a previously asked domain */ - D_DEBUG("%lu: XID %u is already mapped in a previously asked domain.\n", i, id.id); + D_DEBUG("%lu: XID %"PRIu32" is already mapped in a previously asked domain.\n", + i, id.id); continue; } - D_DEBUG("%lu: XID %u will be looked up via dcerpc_wbint_UnixIDs2Sids_send().\n", i, id.id); + D_DEBUG("%lu: XID %"PRIu32" will be looked up via dcerpc_wbint_UnixIDs2Sids_send().\n", + i, id.id); state->dom_xids[state->num_dom_xids++] = id; } @@ -176,7 +180,7 @@ static void wb_xids2sids_dom_done(struct tevent_req *subreq) -- Samba Shared Repository