From: Volker Lendecke Date: Wed, 2 Apr 2025 07:34:57 +0000 (+0200) Subject: winbind: Fix a few Coverity complaints X-Git-Tag: tevent-0.17.0~176 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09b06a452e35b4f15480e31a20c665bb99ba9c12;p=thirdparty%2Fsamba.git winbind: Fix a few Coverity complaints Coverity correctly complains that we pass time_t into a uint32_t. Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c index a73afe483fb..b250daeac78 100644 --- a/source3/winbindd/winbindd_cred_cache.c +++ b/source3/winbindd/winbindd_cred_cache.c @@ -176,8 +176,8 @@ rekinit: #endif add_krb5_ticket_gain_handler_event( entry, - tevent_timeval_set(new_start, - 0)); + (struct timeval) { + .tv_sec = new_start}); return; } TALLOC_FREE(entry->event); @@ -253,7 +253,7 @@ rekinit: /* ticket is destroyed here, we have to regain it * if it is possible */ add_krb5_ticket_gain_handler_event( - entry, tevent_timeval_set(new_start, 0)); + entry, (struct timeval){.tv_sec = new_start}); return; } @@ -283,7 +283,7 @@ done: /* try to regain ticket 10 seconds before expiration */ expire_time -= 10; add_krb5_ticket_gain_handler_event( - entry, tevent_timeval_set(expire_time, 0)); + entry, (struct timeval){.tv_sec = expire_time}); return; } @@ -292,7 +292,7 @@ done: } entry->event = tevent_add_timer(global_event_context(), entry, - tevent_timeval_set(new_start, 0), + (struct timeval){.tv_sec = new_start}, krb5_ticket_refresh_handler, entry); @@ -374,7 +374,7 @@ static void krb5_ticket_gain_handler(struct tevent_context *event_ctx, retry_later: #if defined(DEBUG_KRB5_TKT_RENEWAL) - t = tevent_timeval_set(time(NULL) + 30, 0); + t = timeval_current_ofs(30, 0); #else t = timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0); #endif @@ -385,9 +385,11 @@ static void krb5_ticket_gain_handler(struct tevent_context *event_ctx, got_ticket: #if defined(DEBUG_KRB5_TKT_RENEWAL) - t = tevent_timeval_set(time(NULL) + 30, 0); + t = timeval_current_ofs(30, 0); #else - t = tevent_timeval_set(krb5_event_refresh_time(entry->refresh_time), 0); + t = (struct timeval) { + .tv_sec = krb5_event_refresh_time(entry->refresh_time), + }; #endif if (entry->refresh_time == 0) { @@ -548,11 +550,12 @@ NTSTATUS add_ccache_to_list(const char *princ_name, } else { /* Renew at 1/2 the ticket expiration time */ #if defined(DEBUG_KRB5_TKT_RENEWAL) - t = tevent_timeval_set(time(NULL) + 30, 0); + t = timeval_current_ofs(30, 0); #else - t = tevent_timeval_set(krb5_event_refresh_time( - ticket_end), - 0); + t = (struct timeval) { + .tv_sec = krb5_event_refresh_time( + ticket_end), + }; #endif if (!entry->refresh_time) { entry->refresh_time = t.tv_sec; @@ -663,9 +666,11 @@ NTSTATUS add_ccache_to_list(const char *princ_name, } else { /* Renew at 1/2 the ticket expiration time */ #if defined(DEBUG_KRB5_TKT_RENEWAL) - t = tevent_timeval_set(time(NULL) + 30, 0); + t = timeval_current_ofs(30, 0); #else - t = tevent_timeval_set(krb5_event_refresh_time(ticket_end), 0); + t = (struct timeval) { + .tv_sec = krb5_event_refresh_time(ticket_end), + }; #endif if (entry->refresh_time == 0) { entry->refresh_time = t.tv_sec; diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 956f47c02d9..57e76884416 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -1312,7 +1312,7 @@ static bool calculate_next_machine_pwd_change(const char *domain, next_change = pass_last_set_time + timeout; DEBUG(10,("machine password still valid until: %s\n", http_timestring(talloc_tos(), next_change))); - *t = tevent_timeval_set(next_change, 0); + *t = (struct timeval) { .tv_sec = next_change, }; if (lp_clustering()) { uint8_t randbuf;