>From 48ddf36f3f0a0de64952fb2dede60b051e35259c Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 17 Jul 2013 15:27:20 +0200 Subject: [PATCH 13/16] Fix formating of variables with type: time_t --- src/providers/fail_over.c | 5 +++-- src/providers/krb5/krb5_child_handler.c | 2 +- src/providers/ldap/ldap_auth.c | 2 +- src/providers/ldap/sdap_access.c | 2 +- src/providers/ldap/sdap_async_connection.c | 2 +- src/providers/ldap/sdap_async_sudo_timer.c | 2 +- src/providers/ldap/sdap_sudo.c | 4 ++-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index 537a9aa95a13a5d35895d7a310aab6ae758ebc39..98c20065989bad86acff2b9984726a9176089c44 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -154,8 +154,9 @@ fo_context_init(TALLOC_CTX *mem_ctx, struct fo_options *opts) ctx->opts->family_order = opts->family_order; ctx->opts->service_resolv_timeout = opts->service_resolv_timeout; - DEBUG(SSSDBG_TRACE_FUNC, ("Created new fail over context, retry timeout is %d\n", - ctx->opts->retry_timeout)); + DEBUG(SSSDBG_TRACE_FUNC, + ("Created new fail over context, retry timeout is %ld\n", + ctx->opts->retry_timeout)); return ctx; } diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c index 9aa5c346acde17e1ea74d7a2ab231a6a9eebdb94..aa72c07ce28ef09fa7363d1512742b5c981f435d 100644 --- a/src/providers/krb5/krb5_child_handler.c +++ b/src/providers/krb5/krb5_child_handler.c @@ -564,7 +564,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, tgtt.endtime = int64_to_time_t(time_data); SAFEALIGN_COPY_INT64(&time_data, buf+p+3*sizeof(int64_t), NULL); tgtt.renew_till = int64_to_time_t(time_data); - DEBUG(SSSDBG_TRACE_LIBS, ("TGT times are [%d][%d][%d][%d].\n", + DEBUG(SSSDBG_TRACE_LIBS, ("TGT times are [%ld][%ld][%ld][%ld].\n", tgtt.authtime, tgtt.starttime, tgtt.endtime, tgtt.renew_till)); } diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index bf14c2b87f7d5555f6f1818134f7591a1178fa40..ad682a7857ab5493b67ce76917ac9a04aa64c6bc 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -116,7 +116,7 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now, tzset(); expire_time -= timezone; DEBUG(9, ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " - "daylight [%d] now [%d] expire_time [%d].\n", tzname[0], + "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0], tzname[1], timezone, daylight, now, expire_time)); if (difftime(now, expire_time) > 0.0) { diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c index 0be1179f79a950018a0dd8682b1488a93dea479a..e9659a2999e65e94b4a5bbd1eb0dbf1c12bf0de7 100644 --- a/src/providers/ldap/sdap_access.c +++ b/src/providers/ldap/sdap_access.c @@ -436,7 +436,7 @@ static bool nds_check_expired(const char *exp_time_str) expire_time -= timezone; now = time(NULL); DEBUG(9, ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " - "daylight [%d] now [%d] expire_time [%d].\n", tzname[0], + "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0], tzname[1], timezone, daylight, now, expire_time)); if (difftime(now, expire_time) > 0.0) { diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c index cc3e13d097d33dc7c44e1f1fecccd152ceb6cf67..17d03c3206b61fa442616c57fbc735f87fa6452f 100644 --- a/src/providers/ldap/sdap_async_connection.c +++ b/src/providers/ldap/sdap_async_connection.c @@ -1773,7 +1773,7 @@ static void sdap_cli_auth_step(struct tevent_req *req) || (state->sh->expire_time > (now + expire_timeout))) { state->sh->expire_time = now + expire_timeout; DEBUG(SSSDBG_TRACE_LIBS, - ("the connection will expire at %d\n", state->sh->expire_time)); + ("the connection will expire at %ld\n", state->sh->expire_time)); } if (!state->do_auth || diff --git a/src/providers/ldap/sdap_async_sudo_timer.c b/src/providers/ldap/sdap_async_sudo_timer.c index ed32cd901bc145b10f3613366b24f29e9100bc11..27dd41f06e0a20c8a672a466535debc45e9f8ea2 100644 --- a/src/providers/ldap/sdap_async_sudo_timer.c +++ b/src/providers/ldap/sdap_async_sudo_timer.c @@ -170,7 +170,7 @@ static void sdap_sudo_timer_timeout(struct tevent_context *ev, state = tevent_req_data(req, struct sdap_sudo_timer_state); DEBUG(SSSDBG_CRIT_FAILURE, ("Request timed out. Is timeout too small?" - " (%ds)!\n", state->timeout)); + " (%lds)!\n", state->timeout)); talloc_zfree(state->subreq); diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c index 315f254a3a0c00d48c36d439e0da23e76f2ffce0..cc3e697f017cae7018dba5c356cd25f3f21397da 100644 --- a/src/providers/ldap/sdap_sudo.c +++ b/src/providers/ldap/sdap_sudo.c @@ -228,7 +228,7 @@ static int sdap_sudo_setup_periodical_refresh(struct sdap_sudo_ctx *sudo_ctx) smart_default = id_ctx->opts->basic[SDAP_SUDO_SMART_REFRESH_INTERVAL].def_val.number; DEBUG(SSSDBG_MINOR_FAILURE, ("At least one periodical update has to be " - "enabled. Setting smart refresh interval to default value (%d).\n", + "enabled. Setting smart refresh interval to default value (%ld).\n", smart_default)); ret = dp_opt_set_int(id_ctx->opts->basic, @@ -1073,7 +1073,7 @@ schedule: } DEBUG(SSSDBG_TRACE_FUNC, ("Data provider is offline. " - "Scheduling another full refresh in %lld minutes.\n", delay)); + "Scheduling another full refresh in %ld minutes.\n", delay)); ret = sdap_sudo_schedule_refresh(sudo_ctx, sudo_ctx, SDAP_SUDO_REFRESH_FULL, -- 1.8.3.1