>From 4e349ba0c369ec16d7bc724d7b3d819530f46fa3 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 17 Jul 2013 12:41:33 +0200 Subject: [PATCH 07/20] Fix formating of variables with type: size_t --- src/db/sysdb_autofs.c | 2 +- src/db/sysdb_ops.c | 2 +- src/db/sysdb_search.c | 2 +- src/providers/ad/ad_srv.c | 4 ++-- src/providers/fail_over_srv.c | 2 +- src/providers/ipa/ipa_config.c | 2 +- src/providers/ipa/ipa_idmap.c | 2 +- src/providers/ipa/ipa_netgroups.c | 6 ++++-- src/providers/ipa/ipa_selinux.c | 4 ++-- src/providers/ipa/ipa_selinux_maps.c | 4 ++-- src/providers/ipa/ipa_srv.c | 2 +- src/providers/ipa/ipa_subdomains_ext_groups.c | 2 +- src/providers/krb5/krb5_child.c | 6 +++--- src/providers/krb5/krb5_child_handler.c | 2 +- src/providers/krb5/krb5_renew_tgt.c | 3 ++- src/providers/ldap/ldap_child.c | 6 +++--- src/providers/ldap/ldap_id_cleanup.c | 4 ++-- src/providers/ldap/sdap_access.c | 9 +++++---- src/providers/ldap/sdap_async_autofs.c | 8 ++++---- src/providers/ldap/sdap_async_groups.c | 19 +++++++++++-------- src/providers/ldap/sdap_async_groups_ad.c | 2 +- src/providers/ldap/sdap_async_initgroups.c | 17 ++++++++++------- src/providers/ldap/sdap_async_initgroups_ad.c | 2 +- src/providers/ldap/sdap_async_nested_groups.c | 2 +- src/providers/ldap/sdap_async_netgroups.c | 10 ++++++---- src/providers/ldap/sdap_async_services.c | 8 ++++---- src/providers/ldap/sdap_async_sudo.c | 2 +- src/providers/ldap/sdap_async_users.c | 5 +++-- src/providers/ldap/sdap_child_helpers.c | 2 +- src/providers/simple/simple_access_check.c | 4 ++-- src/responder/nss/nsssrv_mmap_cache.c | 2 +- src/responder/pam/pamsrv_cmd.c | 2 +- src/util/child_common.c | 2 +- 33 files changed, 82 insertions(+), 69 deletions(-) diff --git a/src/db/sysdb_autofs.c b/src/db/sysdb_autofs.c index cc44c350b744fc01f3a081c4a3de57b879a2693a..cb9685623c34ca4330b6e0278a3e7a4300f6b26d 100644 --- a/src/db/sysdb_autofs.c +++ b/src/db/sysdb_autofs.c @@ -407,7 +407,7 @@ sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx, *_count = count; *_entries = talloc_steal(mem_ctx, msgs); ret = EOK; - DEBUG(SSSDBG_TRACE_INTERNAL, ("found %d entries for map %s\n", + DEBUG(SSSDBG_TRACE_INTERNAL, ("found %zu entries for map %s\n", count, mapname)); done: talloc_free(tmp_ctx); diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 45f3289b702d0492c3cbddd7063f2845afa3de00..439a0cd55d6ac847efd51e6f6d41a8847ef0e32a 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -175,7 +175,7 @@ int sysdb_delete_recursive(struct sysdb_ctx *sysdb, goto done; } - DEBUG(9, ("Found [%d] items to delete.\n", msgs_count)); + DEBUG(SSSDBG_TRACE_ALL, ("Found [%zu] items to delete.\n", msgs_count)); qsort(msgs, msgs_count, sizeof(struct ldb_message *), compare_ldb_dn_comp_num); diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c index d70d0cc3eee6fe5fa55bee6a36d4e8382d69c3ab..8dfaf1f2ada22db5e70ebe18bee1ee299e4767dd 100644 --- a/src/db/sysdb_search.c +++ b/src/db/sysdb_search.c @@ -972,7 +972,7 @@ errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, } direct_parents[pi] = NULL; - DEBUG(7, ("%s is a member of %d sysdb groups\n", + DEBUG(SSSDBG_TRACE_LIBS, ("%s is a member of %zu sysdb groups\n", name, direct_sysdb_count)); *_direct_parents = talloc_steal(mem_ctx, direct_parents); ret = EOK; diff --git a/src/providers/ad/ad_srv.c b/src/providers/ad/ad_srv.c index 4ae91f07bfbaafcb12caf82d3e3847f111cdf9fc..dc310020a4e37d199bd047bfcdeb3e40af2d4d84 100644 --- a/src/providers/ad/ad_srv.c +++ b/src/providers/ad/ad_srv.c @@ -113,7 +113,7 @@ static void ad_get_dc_servers_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Found %lu domain controllers in domain %s\n", + DEBUG(SSSDBG_TRACE_FUNC, ("Found %zu domain controllers in domain %s\n", state->num_servers, domain)); done: @@ -759,7 +759,7 @@ static void ad_srv_plugin_servers_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu primary and %lu backup servers\n", + DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu primary and %zu backup servers\n", state->num_primary_servers, state->num_backup_servers)); tevent_req_done(req); diff --git a/src/providers/fail_over_srv.c b/src/providers/fail_over_srv.c index 189abf14b87bb9475db2fb2049edcb48fb2f47bc..0523e0fa1ca8d6f7c1ab0c5c9771415a3414a3c7 100644 --- a/src/providers/fail_over_srv.c +++ b/src/providers/fail_over_srv.c @@ -110,7 +110,7 @@ static void fo_discover_srv_done(struct tevent_req *subreq) state->num_servers++; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu servers\n", state->num_servers)); + DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu servers\n", state->num_servers)); state->servers = talloc_array(state, struct fo_server_info, state->num_servers); diff --git a/src/providers/ipa/ipa_config.c b/src/providers/ipa/ipa_config.c index 05231cc763c28c2867688530a6d4c17d2fd30933..0b392f5129ce895af2c0ca88286981a79cc5f4bc 100644 --- a/src/providers/ipa/ipa_config.c +++ b/src/providers/ipa/ipa_config.c @@ -125,7 +125,7 @@ static void ipa_get_config_done(struct tevent_req *subreq) if (reply_count != 1) { DEBUG(SSSDBG_OP_FAILURE, ("Unexpected number of results, expected 1, " - "got %d.\n", reply_count)); + "got %zu.\n", reply_count)); ret = EINVAL; goto done; } diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c index c108ca75b84005c3d5957cd45ca89209d59f59ff..69ab55c92fcd274836b36d68ec08ac3b67b53685 100644 --- a/src/providers/ipa/ipa_idmap.c +++ b/src/providers/ipa/ipa_idmap.c @@ -194,7 +194,7 @@ errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_CONF_SETTINGS, - ("Initializing [%d] domains for ID-mapping\n", range_count)); + ("Initializing [%zu] domains for ID-mapping\n", range_count)); for (c = 0; c < range_count; c++) { diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c index 0f36fc9f542f7b58ebb45664edc0e964ad2f92ff..0deb3944ef93ae1c1175f9e1c5526274cc849986 100644 --- a/src/providers/ipa/ipa_netgroups.c +++ b/src/providers/ipa/ipa_netgroups.c @@ -315,7 +315,8 @@ static void ipa_get_netgroups_process(struct tevent_req *subreq) goto done; } - DEBUG(6, ("Search for netgroups, returned %d results.\n", netgroups_count)); + DEBUG(SSSDBG_TRACE_FUNC, ("Search for netgroups, returned %zu results.\n", + netgroups_count)); if (netgroups_count == 0) { /* No netgroups found in this search */ @@ -575,7 +576,8 @@ static void ipa_netgr_members_process(struct tevent_req *subreq) goto fail; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found %u members in current search base\n", count)); + DEBUG(SSSDBG_TRACE_INTERNAL, ("Found %zu members in current search base\n", + count)); next_call = NULL; /* While processing a batch of entities from one search base, diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index 5f734338b8fb43d6d99ba9adcb25c655f8cb1951..c227db937a84228c0f3945dbe11ba904c7ad9744 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -1163,7 +1163,7 @@ static void ipa_get_selinux_maps_done(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Found %d SELinux user maps\n", state->nmaps)); + ("Found %zu SELinux user maps\n", state->nmaps)); check_hbac = false; for (i = 0; i < state->nmaps; i++) { @@ -1222,7 +1222,7 @@ static void ipa_get_selinux_hbac_done(struct tevent_req *subreq) ret = ipa_hbac_rule_info_recv(subreq, state, &state->hbac_rule_count, &state->hbac_rules); DEBUG(SSSDBG_TRACE_INTERNAL, - ("Received %d HBAC rules\n", state->hbac_rule_count)); + ("Received %zu HBAC rules\n", state->hbac_rule_count)); talloc_free(subreq); if (ret != EOK) { diff --git a/src/providers/ipa/ipa_selinux_maps.c b/src/providers/ipa/ipa_selinux_maps.c index b0a2c8f727be2af0a4eb878f4b5b56a7b0ef11bd..1a210689b17b674158420c48ead7e9011cc35764 100644 --- a/src/providers/ipa/ipa_selinux_maps.c +++ b/src/providers/ipa/ipa_selinux_maps.c @@ -165,8 +165,8 @@ static void ipa_selinux_get_maps_done(struct tevent_req *subreq) } if (count > 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("Found %d user maps in current search base\n", - count)); + DEBUG(SSSDBG_TRACE_FUNC, + ("Found %zu user maps in current search base\n", count)); total_count = count + state->map_count; state->maps = talloc_realloc(state, state->maps, struct sysdb_attrs *, total_count); diff --git a/src/providers/ipa/ipa_srv.c b/src/providers/ipa/ipa_srv.c index d604871a277574c93e2c7adf59cf6fa5065c89b7..aa07cf0542d294118728c7706bbfa50092d43b3b 100644 --- a/src/providers/ipa/ipa_srv.c +++ b/src/providers/ipa/ipa_srv.c @@ -173,7 +173,7 @@ static void ipa_srv_plugin_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got %lu primary and %lu backup servers\n", + DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu primary and %zu backup servers\n", state->num_primary_servers, state->num_backup_servers)); tevent_req_done(req); diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c index 0244fee99a709cabe2ca7ee76206f3c94718400d..cd098cde04c7739a58b4e6a583eaae44be5f49b1 100644 --- a/src/providers/ipa/ipa_subdomains_ext_groups.c +++ b/src/providers/ipa/ipa_subdomains_ext_groups.c @@ -594,7 +594,7 @@ static void ipa_get_ext_groups_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_FUNC, ("[%d] external groups found.\n", + DEBUG(SSSDBG_TRACE_FUNC, ("[%zu] external groups found.\n", state->reply_count)); ret = process_ext_groups(state->server_mode->ext_groups, diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index afd39b854786cb8081f050b85dcc0e9be5f23d1e..e69f5e35d517a00c101b3499dae8bee5e75c5bdb 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -887,7 +887,7 @@ static errno_t pack_response_packet(TALLOC_CTX *mem_ctx, errno_t error, safealign_memcpy(&buf[p], pdr->data, pdr->len, &p); } - DEBUG(SSSDBG_TRACE_INTERNAL, ("response packet size: [%d]\n", p)); + DEBUG(SSSDBG_TRACE_INTERNAL, ("response packet size: [%zu]\n", p)); *_buf = buf; *_len = p; @@ -941,7 +941,7 @@ static errno_t k5c_send_data(struct krb5_req *kr, int fd, errno_t error) if (written != len) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Write error, wrote [%d] bytes, expected [%d]\n", + ("Write error, wrote [%zu] bytes, expected [%zu]\n", written, len)); return EOK; } @@ -1705,7 +1705,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, struct pam_data *pd; errno_t ret; - DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: [%d]\n", size)); + DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: [%zu]\n", size)); if (!offline || !kr) return EINVAL; diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c index 20b83d1372fdf0026b36a4b9877673d3dce25ddd..9aa5c346acde17e1ea74d7a2ab231a6a9eebdb94 100644 --- a/src/providers/krb5/krb5_child_handler.c +++ b/src/providers/krb5/krb5_child_handler.c @@ -538,7 +538,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, msg_status, msg_type, msg_len)); if ((p + msg_len) > len) { - DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%zd].\n", + DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%zu] > [%zd].\n", p+msg_len, len)); return EINVAL; } diff --git a/src/providers/krb5/krb5_renew_tgt.c b/src/providers/krb5/krb5_renew_tgt.c index d6cdff8f8c0efc98445363c0a12a7ec19d12477f..9102f8ca37668abbcef99b78e8c042ebab32025f 100644 --- a/src/providers/krb5/krb5_renew_tgt.c +++ b/src/providers/krb5/krb5_renew_tgt.c @@ -412,7 +412,8 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) ret = EOK; goto done; } - DEBUG(9, ("Found [%d] entries with ccache file in cache.\n", msgs_count)); + DEBUG(SSSDBG_TRACE_ALL, + ("Found [%zu] entries with ccache file in cache.\n", msgs_count)); for (c = 0; c < msgs_count; c++) { user_name = ldb_msg_find_attr_as_string(msgs[c], SYSDB_NAME, NULL); diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index 9d82e7cf7c7a556c0e9f124c60a90170e21135b3..19c838dacc10bfa0428d96e2d8497d4b25b07079 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -57,7 +57,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, size_t p = 0; uint32_t len; - DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: %d\n", size)); + DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: %zu\n", size)); /* realm_str size and length */ SAFEALIGN_COPY_UINT32_CHECK(&len, buf + p, size, &p); @@ -112,7 +112,7 @@ static int pack_buffer(struct response *r, int result, krb5_error_code krberr, r->size = 2 * sizeof(uint32_t) + sizeof(krb5_error_code) + len + sizeof(time_t); - DEBUG(SSSDBG_TRACE_INTERNAL, ("response size: %d\n",r->size)); + DEBUG(SSSDBG_TRACE_INTERNAL, ("response size: %zu\n",r->size)); r->buf = talloc_array(r, uint8_t, r->size); if(!r->buf) { @@ -540,7 +540,7 @@ int main(int argc, const char *argv[]) } if (written != resp->size) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Expected to write %d bytes, wrote %d\n", + DEBUG(SSSDBG_CRIT_FAILURE, ("Expected to write %zu bytes, wrote %zu\n", resp->size, written)); goto fail; } diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c index 1fd2ff49fe7e80fc9856eb7fadb9017145fb4b45..c13d1714287645f0e168e25d5ef2e86e3116c7f6 100644 --- a/src/providers/ldap/ldap_id_cleanup.c +++ b/src/providers/ldap/ldap_id_cleanup.c @@ -226,7 +226,7 @@ static int cleanup_users(struct sdap_options *opts, goto done; } - DEBUG(4, ("Found %d expired user entries!\n", count)); + DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired user entries!\n", count)); if (count == 0) { ret = EOK; @@ -348,7 +348,7 @@ static int cleanup_groups(TALLOC_CTX *memctx, goto done; } - DEBUG(4, ("Found %d expired group entries!\n", count)); + DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired group entries!\n", count)); if (count == 0) { ret = EOK; diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c index b381fc40570fb1fabe88255a6543c06453a7d9ce..9ea9077551b71d494947c7bfd7477ac8ddf227a2 100644 --- a/src/providers/ldap/sdap_access.c +++ b/src/providers/ldap/sdap_access.c @@ -464,8 +464,9 @@ static bool nds_check_time_map(const struct ldb_val *time_map) } if (time_map->length != 42) { - DEBUG(4, ("Allowed time map has the wrong size, " - "got [%d], expected 42.\n", time_map->length)); + DEBUG(SSSDBG_FUNC_DATA, + ("Allowed time map has the wrong size, " + "got [%zu], expected 42.\n", time_map->length)); return true; } @@ -477,7 +478,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map) if (map_index > 335) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unexpected index value [%d] for time map.\n", map_index)); + ("Unexpected index value [%zu] for time map.\n", map_index)); return true; } @@ -485,7 +486,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map) if (q.quot > 41 || q.quot < 0 || q.rem > 7 || q.rem < 0) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unexpected result of div(), [%d][%d][%d].\n", + ("Unexpected result of div(), [%zu][%d][%d].\n", map_index, q.quot, q.rem)); return true; } diff --git a/src/providers/ldap/sdap_async_autofs.c b/src/providers/ldap/sdap_async_autofs.c index ae70e703564acebaa1ca9adfb2395ca1c06fd802..4886150f92ec08ee82f9736a7b0cfd52bea7ff91 100644 --- a/src/providers/ldap/sdap_async_autofs.c +++ b/src/providers/ldap/sdap_async_autofs.c @@ -394,7 +394,7 @@ automntmaps_process_members_done(struct tevent_req *subreq) DEBUG(SSSDBG_TRACE_INTERNAL, ("No more search bases to try\n")); DEBUG(SSSDBG_TRACE_FUNC, - ("Search for autofs entries, returned %d results.\n", + ("Search for autofs entries, returned %zu results.\n", state->entries_count)); tevent_req_done(req); @@ -549,7 +549,7 @@ sdap_get_automntmap_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for autofs maps, returned %d results.\n", state->count)); + ("Search for autofs maps, returned %zu results.\n", state->count)); if (state->count == 0) { /* No maps found in this search */ @@ -801,7 +801,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) if (!tmp_ctx) return ENOMEM; DEBUG(SSSDBG_TRACE_LIBS, - ("Got %d map entries from LDAP\n", state->entries_count)); + ("Got %zu map entries from LDAP\n", state->entries_count)); if (state->entries_count == 0) { /* No entries for this map in LDAP. * We need to ensure that there are no entries @@ -866,7 +866,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Got %d map entries from sysdb\n", count)); + DEBUG(SSSDBG_TRACE_LIBS, ("Got %zu map entries from sysdb\n", count)); if (count == 0) { /* No map members for this map in sysdb currently */ sysdb_entrylist = NULL; diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index bec27e0a7c7101f5a31c45cc0056b1c9ee2667cf..2ce1d5dd6020ca7b81ab0d09ddd28412fe6dc555 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -377,7 +377,7 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, ghostel->num_values = gh->num_values; cnt = ghostel->num_values + memberel->num_values; - DEBUG(SSSDBG_TRACE_FUNC, ("Group has %d members\n", cnt)); + DEBUG(SSSDBG_TRACE_FUNC, ("Group has %zu members\n", cnt)); /* Now process RFC2307bis ghost hash table */ if (ghosts && cnt > 0) { @@ -1072,8 +1072,9 @@ sdap_process_missing_member_2307bis(struct tevent_req *req, if (grp_state->check_count > GROUPMEMBER_REQ_PARALLEL) { DEBUG(7, (" queueing search for: %s\n", user_dn)); if (!grp_state->queued_members) { - DEBUG(7, ("Allocating queue for %d members\n", - num_users - grp_state->check_count)); + DEBUG(SSSDBG_TRACE_LIBS, + ("Allocating queue for %zu members\n", + num_users - grp_state->check_count)); grp_state->queued_members = talloc_array(grp_state, char *, num_users - grp_state->check_count + 1); @@ -1349,7 +1350,7 @@ static void sdap_process_group_members(struct tevent_req *subreq) uint8_t* name_string; state->check_count--; - DEBUG(9, ("Members remaining: %d\n", state->check_count)); + DEBUG(SSSDBG_TRACE_ALL, ("Members remaining: %zu\n", state->check_count)); ret = sdap_get_generic_recv(subreq, state, &count, &usr_attrs); talloc_zfree(subreq); @@ -1358,7 +1359,8 @@ static void sdap_process_group_members(struct tevent_req *subreq) } if (count != 1) { ret = EINVAL; - DEBUG(7, ("Expected one user entry and got %d\n", count)); + DEBUG(SSSDBG_TRACE_LIBS, + ("Expected one user entry and got %zu\n", count)); goto next; } ret = sysdb_attrs_get_el(usr_attrs[0], @@ -1584,7 +1586,8 @@ static void sdap_get_groups_process(struct tevent_req *subreq) return; } - DEBUG(6, ("Search for groups, returned %d results.\n", count)); + DEBUG(SSSDBG_TRACE_FUNC, + ("Search for groups, returned %zu results.\n", count)); if (!state->enumeration && count > 1) { DEBUG(SSSDBG_MINOR_FAILURE, @@ -1747,7 +1750,7 @@ static void sdap_get_groups_done(struct tevent_req *subreq) } state->check_count--; - DEBUG(9, ("Groups remaining: %d\n", state->check_count)); + DEBUG(SSSDBG_TRACE_ALL, ("Groups remaining: %zu\n", state->check_count)); if (state->check_count == 0) { @@ -1765,7 +1768,7 @@ static void sdap_get_groups_done(struct tevent_req *subreq) tevent_req_error(req, ret); return; } - DEBUG(9, ("Saving %d Groups - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Groups - Done\n", state->count)); sysret = sysdb_transaction_commit(state->sysdb); if (sysret != EOK) { DEBUG(0, ("Couldn't commit transaction\n")); diff --git a/src/providers/ldap/sdap_async_groups_ad.c b/src/providers/ldap/sdap_async_groups_ad.c index 1268f7e7de30849d1948265e50a327501982749d..9b61c697d5789c3ec3467ec52a7171f6a640ce9e 100644 --- a/src/providers/ldap/sdap_async_groups_ad.c +++ b/src/providers/ldap/sdap_async_groups_ad.c @@ -189,7 +189,7 @@ sdap_get_ad_match_rule_members_step(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_LIBS, - ("Search for users returned %d results\n", count)); + ("Search for users returned %zu results\n", count)); /* Add this batch of users to the list */ if (count > 0) { diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index aa0ea4c1b28fa2a69390605d3fff3cfff1642aa1..a0df82ca54c89f1df0e301d4e0bae439c97f20f7 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -954,8 +954,9 @@ static void sdap_initgr_nested_search(struct tevent_req *subreq) groups[0]); state->groups_cur++; } else { - DEBUG(2, ("Search for group %s, returned %d results. Skipping\n", - state->group_dns[state->cur], count)); + DEBUG(SSSDBG_OP_FAILURE, + ("Search for group %s, returned %zu results. Skipping\n", + state->group_dns[state->cur], count)); } state->cur++; @@ -1619,7 +1620,7 @@ static void sdap_initgr_rfc2307bis_process(struct tevent_req *subreq) return; } DEBUG(SSSDBG_TRACE_LIBS, - ("Found %d parent groups for user [%s]\n", count, state->name)); + ("Found %zu parent groups for user [%s]\n", count, state->name)); /* Add this batch of groups to the list */ if (count > 0) { @@ -2128,7 +2129,8 @@ struct tevent_req *rfc2307bis_nested_groups_send( struct sdap_rfc2307bis_nested_ctx *state; DEBUG(SSSDBG_TRACE_INTERNAL, - ("About to process %d groups in nesting level %d\n", num_groups, nesting)); + ("About to process %zu groups in nesting level %zu\n", + num_groups, nesting)); req = tevent_req_create(mem_ctx, &state, struct sdap_rfc2307bis_nested_ctx); @@ -2376,7 +2378,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_LIBS, - ("Found %d parent groups of [%s]\n", count, state->orig_dn)); + ("Found %zu parent groups of [%s]\n", count, state->orig_dn)); ngr = state->processed_groups[state->group_iter]; /* Add this batch of groups to the list */ @@ -2405,7 +2407,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) ngr->ldap_parents[ngr->parents_count] = NULL; DEBUG(SSSDBG_TRACE_INTERNAL, - ("Total of %d direct parents after this iteration\n", + ("Total of %zu direct parents after this iteration\n", ngr->parents_count)); } @@ -2727,7 +2729,8 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) return; } } else if (count != 1) { - DEBUG(2, ("Expected one user entry and got %d\n", count)); + DEBUG(SSSDBG_OP_FAILURE, + ("Expected one user entry and got %zu\n", count)); tevent_req_error(req, EINVAL); return; } diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index e5649a2b9793253a55c48fba69cd3a902c0dc967..efaa247dd22d2ae100e8881c010dfe26a9a10cca 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -212,7 +212,7 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_LIBS, - ("Search for users returned %d results\n", count)); + ("Search for users returned %zu results\n", count)); /* Add this batch of groups to the list */ if (count > 0) { diff --git a/src/providers/ldap/sdap_async_nested_groups.c b/src/providers/ldap/sdap_async_nested_groups.c index 0147a607f75302ce1d05c1385d717156c7a3184e..6e7056618d801f84a706c06cefd9a9854b469222 100644 --- a/src/providers/ldap/sdap_async_nested_groups.c +++ b/src/providers/ldap/sdap_async_nested_groups.c @@ -2036,7 +2036,7 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Received %d dereference results, " + DEBUG(SSSDBG_TRACE_INTERNAL, ("Received %zu dereference results, " "about to process them\n", num_entries)); /* diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c index 265fcf0ea8d3ac3a743433ce234a5faf8a673c61..46ea980677234c682bd48c371b62b90a2666ab87 100644 --- a/src/providers/ldap/sdap_async_netgroups.c +++ b/src/providers/ldap/sdap_async_netgroups.c @@ -490,8 +490,9 @@ static void netgr_translate_members_ldap_done(struct tevent_req *subreq) } break; default: - DEBUG(1, ("Unexpected number of results [%d] for base search.\n", - count)); + DEBUG(SSSDBG_CRIT_FAILURE, + ("Unexpected number of results [%zu] for base search.\n", + count)); } if (state->dn_item->cn == NULL) { @@ -659,7 +660,8 @@ static void sdap_get_netgroups_process(struct tevent_req *subreq) return; } - DEBUG(6, ("Search for netgroups, returned %d results.\n", state->count)); + DEBUG(SSSDBG_TRACE_FUNC, + ("Search for netgroups, returned %zu results.\n", state->count)); if (state->count == 0) { /* No netgroups found in this search */ @@ -723,7 +725,7 @@ static void netgr_translate_members_done(struct tevent_req *subreq) } } - DEBUG(9, ("Saving %d Netgroups - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Netgroups - Done\n", state->count)); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_async_services.c b/src/providers/ldap/sdap_async_services.c index d637d22e59a68a0957ce01f92ddb99ee8d111f5f..c4245f0574200bca5d3c5770eeefb5b03445393c 100644 --- a/src/providers/ldap/sdap_async_services.c +++ b/src/providers/ldap/sdap_async_services.c @@ -177,7 +177,7 @@ sdap_get_services_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for services, returned %d results.\n", + ("Search for services, returned %zu results.\n", count)); if (state->enumeration || count == 0) { @@ -240,7 +240,7 @@ sdap_get_services_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_INTERNAL, - ("Saving %d services - Done\n", state->count)); + ("Saving %zu services - Done\n", state->count)); tevent_req_done(req); } @@ -292,10 +292,10 @@ sdap_save_services(TALLOC_CTX *mem_ctx, * Just report the failure to save and go on */ if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to store service %d. Ignoring.\n", i)); + ("Failed to store service %zu. Ignoring.\n", i)); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Service [%lu/%lu] processed!\n", i, num_services)); + ("Service [%zu/%zu] processed!\n", i, num_services)); } if (usn_value) { diff --git a/src/providers/ldap/sdap_async_sudo.c b/src/providers/ldap/sdap_async_sudo.c index ed4cf75ad5e38df3b955f5fe061a8b188fe89927..0d4882bd119dd4d4d217163f97cad275921adf8d 100644 --- a/src/providers/ldap/sdap_async_sudo.c +++ b/src/providers/ldap/sdap_async_sudo.c @@ -477,7 +477,7 @@ static void sdap_sudo_refresh_load_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Received %d rules\n", rules_count)); + DEBUG(SSSDBG_TRACE_FUNC, ("Received %zu rules\n", rules_count)); /* start transaction */ ret = sysdb_transaction_start(state->sysdb); diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index 353dc3992f4124187daeb90419d010253a00f63f..860e8feaf1bfcc99ce0640be417acc2bbf563887 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -697,7 +697,8 @@ static void sdap_get_users_process(struct tevent_req *subreq) return; } - DEBUG(6, ("Search for users, returned %d results.\n", count)); + DEBUG(SSSDBG_TRACE_FUNC, + ("Search for users, returned %zu results.\n", count)); if (state->enumeration || count == 0) { /* No users found in this search or enumerating */ @@ -758,7 +759,7 @@ static void sdap_get_users_process(struct tevent_req *subreq) return; } - DEBUG(9, ("Saving %d Users - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Users - Done\n", state->count)); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_child_helpers.c b/src/providers/ldap/sdap_child_helpers.c index e57313442fec1723e3cbcc186d9720b7e9a6ce89..9aaff785b789139dee033ecf73d1f74917d9a94c 100644 --- a/src/providers/ldap/sdap_child_helpers.c +++ b/src/providers/ldap/sdap_child_helpers.c @@ -160,7 +160,7 @@ static errno_t create_tgt_req_send_buffer(TALLOC_CTX *mem_ctx, buf->size += strlen(keytab_name); } - DEBUG(7, ("buffer size: %d\n", buf->size)); + DEBUG(SSSDBG_TRACE_FUNC, ("buffer size: %zu\n", buf->size)); buf->data = talloc_size(buf, buf->size); if (buf->data == NULL) { diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c index dc5f3676484c3748186cbe69fd4260ee329568a6..7335135ea5dedecdb5ba2be60a57d18eb897a960 100644 --- a/src/providers/simple/simple_access_check.c +++ b/src/providers/simple/simple_access_check.c @@ -389,7 +389,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_TRACE_FUNC, - ("User %s is a member of %d supplemental groups\n", + ("User %s is a member of %zu supplemental groups\n", username, group_count)); /* One extra space for terminator, one extra space for private group */ @@ -435,7 +435,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Need to resolve %d groups\n", state->num_gids)); + DEBUG(SSSDBG_TRACE_FUNC, ("Need to resolve %zu groups\n", state->num_gids)); state->giter = 0; subreq = simple_resolve_group_send(req, state->ev, state->ctx, state->lookup_gids[state->giter]); diff --git a/src/responder/nss/nsssrv_mmap_cache.c b/src/responder/nss/nsssrv_mmap_cache.c index 84570ac204b12a561a337ba9f3fd1ce9d104feaf..2b3dc37eac13cb23fbd9348c0642333d0bba6708 100644 --- a/src/responder/nss/nsssrv_mmap_cache.c +++ b/src/responder/nss/nsssrv_mmap_cache.c @@ -1205,7 +1205,7 @@ errno_t sss_mmap_cache_init(TALLOC_CTX *mem_ctx, const char *name, MAP_SHARED, mc_ctx->fd, 0); if (mc_ctx->mmap_base == MAP_FAILED) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to mmap file %s(%ld): %d(%s)\n", + DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to mmap file %s(%zu): %d(%s)\n", mc_ctx->file, mc_ctx->mmap_size, ret, strerror(ret))); goto done; diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 085bd8869b34de9aa6782618dc76dcaec8e74139..32efc4ba85d0f29dd3a52fc2d217c079ec480b2d 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -610,7 +610,7 @@ static void pam_reply(struct pam_auth_req *preq) } sss_packet_get_body(cctx->creq->out, &body, &blen); - DEBUG(4, ("blen: %d\n", blen)); + DEBUG(SSSDBG_FUNC_DATA, ("blen: %zu\n", blen)); p = 0; memcpy(&body[p], &pd->pam_status, sizeof(int32_t)); diff --git a/src/util/child_common.c b/src/util/child_common.c index 28358606b0ba8b5fa6a28450f3111b68f8668fbf..55b3672f4ec948c9c832b4af0a9b5a61519091eb 100644 --- a/src/util/child_common.c +++ b/src/util/child_common.c @@ -382,7 +382,7 @@ static void write_pipe_handler(struct tevent_context *ev, } if (state->len != state->written) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Wrote %d bytes, expected %d\n", + DEBUG(SSSDBG_CRIT_FAILURE, ("Wrote %zu bytes, expected %zu\n", state->written, state->len)); tevent_req_error(req, EIO); return; -- 1.8.3.1