The branch, master has been updated
via c694aa58b01 utils: Fixing CID 1509038 for time_t in DEBUG statement
via 485ade41b05 utils: Fixing CID 1509034 for time_t in DEBUG statement
via ba0a748654b utils: Fixing CID 1508980 for time_t in DEBUG statement
via ca6ec7b4840 passdb: Fixing CID 1508971 for time_t in DEBUG statement
via c25a5a26a1c passdb: Fixing CID 1508970 for time_t in DEBUG statement
via 16cd2f33721 winbindd: Fixing CID 1508950 for time_t in DEBUG
statement
via 00e2d9b5e83 nmbd: Fixing CID 1508948 for time_t in DEBUG statement
via 85a8f01bc49 nmbd: Fixing CID 1509039 for time_t in DEBUG statement
from 7143caeecc8 smbd: Fix Bug 15897
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c694aa58b0131a7da7e2f7d18c82b847d2ca223a
Author: Rabinarayan Panigrahi <[email protected]>
Date: Fri Sep 5 10:02:55 2025 +0530
utils: Fixing CID 1509038 for time_t in DEBUG statement
Fix: typecast changing from (int)nt_time_to_unix_abs to
(intmax_t)nt_time_to_unix_abs) as intmax_t can hold
epoch seconds after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Wed Sep 10 10:38:24 UTC 2025 on atb-devel-224
commit 485ade41b05a434b6b9c94bd05323caa67a6f3b3
Author: Rabinarayan Panigrahi <[email protected]>
Date: Fri Sep 5 09:45:20 2025 +0530
utils: Fixing CID 1509034 for time_t in DEBUG statement
Fix: typecast changing from (int)nt_time_to_unix_abs(&i12->lockout_window)
to (intmax_t)nt_time_to_unix_abs(&i12->lockout_window)
as intmax_t can hold epoch seconds after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit ba0a748654b11bff5caaf3e8aca0ab7a5bd7022c
Author: Rabinarayan Panigrahi <[email protected]>
Date: Fri Sep 5 09:23:39 2025 +0530
utils: Fixing CID 1508980 for time_t in DEBUG statement
Fix: typecast changing from (int)t to (intmax_t)t
as intmax_t can hold epoch seconds after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit ca6ec7b48404abdb3ca85ce2f6e8f68c6f6f38ed
Author: Rabinarayan Panigrahi <[email protected]>
Date: Thu Sep 4 19:52:05 2025 +0530
passdb: Fixing CID 1508971 for time_t in DEBUG statement
Fix: typecast changing from (unsigned int)badtime to (intmax_t)badtime
as intmax_t can hold epoch seconds after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit c25a5a26a1cba698420fb64e23bee3b52540b21b
Author: Rabinarayan Panigrahi <[email protected]>
Date: Thu Sep 4 18:27:00 2025 +0530
passdb: Fixing CID 1508970 for time_t in DEBUG statement
Fix: typecast changing from (unsigned int)entry->bad_password_time to
(intmax_t)entry->bad_password_time as intmax_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 16cd2f337218eea2d11fb3c0b3155eeea910bcf9
Author: Rabinarayan Panigrahi <[email protected]>
Date: Thu Sep 4 18:13:31 2025 +0530
winbindd: Fixing CID 1508950 for time_t in DEBUG statement
Fix: typecast changing from (uint32_t)domain->last_seq_check to
(intmax_t)domain->last_seq_check as intmax_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 00e2d9b5e8317c8c5f52725a6cf2e53d6f5c56be
Author: Rabinarayan Panigrahi <[email protected]>
Date: Thu Sep 4 15:51:18 2025 +0530
nmbd: Fixing CID 1508948 for time_t in DEBUG statement
Fix: typecast changing from (int)namerec->data.death_time to
(intmax_t)namerec->data.death_time as intmax_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 85a8f01bc497f399797c1035d6be49999014d6bd
Author: Rabinarayan Panigrahi <[email protected]>
Date: Fri Sep 5 10:31:16 2025 +0530
nmbd: Fixing CID 1509039 for time_t in DEBUG statement
Fix: typecast changing from (int)t to (intmax_t)t as intmax_t
can hold epoch seconds after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/libads/sitename_cache.c | 4 ++--
source3/nmbd/nmbd_sendannounce.c | 4 ++--
source3/nmbd/nmbd_winsserver.c | 4 ++--
source3/passdb/login_cache.c | 4 ++--
source3/passdb/pdb_ldap.c | 8 ++++----
source3/utils/net_rpc_sh_acct.c | 12 ++++++------
source3/winbindd/winbindd_cache.c | 8 ++++----
7 files changed, 22 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/sitename_cache.c b/source3/libads/sitename_cache.c
index 4bf2ca7ae2e..88976baefb7 100644
--- a/source3/libads/sitename_cache.c
+++ b/source3/libads/sitename_cache.c
@@ -63,8 +63,8 @@ bool sitename_store(const char *realm, const char *sitename)
expire = get_time_t_max(); /* Store indefinitely. */
- DEBUG(10,("sitename_store: realm = [%s], sitename = [%s], expire =
[%u]\n",
- realm, sitename, (unsigned int)expire ));
+ DEBUG(10,("sitename_store: realm = [%s], sitename = [%s], expire =
[%jd]\n",
+ realm, sitename, (intmax_t)expire ));
ret = gencache_set( key, sitename, expire );
TALLOC_FREE(key);
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 4e8be04f3b5..e9b87040c43 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -384,8 +384,8 @@ void announce_myself_to_domain_master_browser(time_t t)
announce_timer_last = t;
if ((t-announce_timer_last) < (CHECK_TIME_MST_ANNOUNCE * 60)) {
- DBG_DEBUG("announce_myself_to_domain_master_browser: t (%d) -
last(%d) < %d\n",
- (int)t, (int)announce_timer_last,
+ DBG_DEBUG("announce_myself_to_domain_master_browser: t (%jd) -
last(%d) < %d\n",
+ (intmax_t)t, (int)announce_timer_last,
CHECK_TIME_MST_ANNOUNCE * 60 );
return;
}
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 4d4f19fef8b..bbe224e904e 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -422,8 +422,8 @@ static void update_wins_flag(struct name_record *namerec,
int flags)
/* and add the given bits */
namerec->data.wins_flags|=flags;
- DEBUG(8,("update_wins_flag: nbflags: 0x%x, ttl: %d, flags: 0x%x,
winsflags: 0x%x\n",
- namerec->data.nb_flags, (int)namerec->data.death_time, flags,
namerec->data.wins_flags));
+ DEBUG(8,("update_wins_flag: nbflags: 0x%x, ttl: %jd, flags: 0x%x,
winsflags: 0x%x\n",
+ namerec->data.nb_flags, (intmax_t)namerec->data.death_time,
flags, namerec->data.wins_flags));
}
/****************************************************************************
diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index 6b636b3c8b7..e4f23f0caba 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -116,9 +116,9 @@ bool login_cache_read(struct samu *sampass, struct
login_cache *entry)
SAFE_FREE(databuf.dptr);
- DEBUG(5, ("Found login cache entry: timestamp %12u, flags 0x%x, count
%d, time %12u\n",
+ DEBUG(5, ("Found login cache entry: timestamp %12u, flags 0x%x, count
%d, time %12jd\n",
(unsigned int)entry->entry_timestamp, entry->acct_ctrl,
- entry->bad_password_count, (unsigned
int)entry->bad_password_time));
+ entry->bad_password_count,
(intmax_t)entry->bad_password_time));
return true;
}
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 14b3dfc2493..4ab387b5a5c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1441,12 +1441,12 @@ static bool init_ldap_from_sam (struct ldapsam_privates
*ldap_state,
uint32_t pol;
pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &pol);
- DEBUG(3, ("updating bad password fields, policy=%u, count=%u,
time=%u\n",
- (unsigned int)pol, (unsigned int)badcount, (unsigned
int)badtime));
+ DEBUG(3, ("updating bad password fields, policy=%u, count=%u,
time=%jd\n",
+ (unsigned int)pol, (unsigned int)badcount,
(intmax_t)badtime));
if ((badcount >= pol) || (badcount == 0)) {
- DEBUG(7, ("making mods to update ldap, count=%u,
time=%u\n",
- (unsigned int)badcount, (unsigned int)badtime));
+ DEBUG(7, ("making mods to update ldap, count=%u,
time=%jd\n",
+ (unsigned int)badcount, (intmax_t)badtime));
if (asprintf(&temp, "%li", (long)badcount) < 0) {
return false;
}
diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 55abafb4bca..dc2e56f5f9b 100644
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -220,7 +220,7 @@ static int account_show(struct net_context *c,
d_printf(_("Account lockout duration: "));
if (nt_time_is_set(&i12->lockout_duration)) {
time_t t = nt_time_to_unix_abs(&i12->lockout_duration);
- d_printf(_("%d seconds\n"), (int)t);
+ d_printf(_("%jd seconds\n"), (intmax_t)t);
} else {
d_printf(_("not set\n"));
}
@@ -228,7 +228,7 @@ static int account_show(struct net_context *c,
d_printf(_("Bad password count reset after: "));
if (nt_time_is_set(&i12->lockout_window)) {
time_t t = nt_time_to_unix_abs(&i12->lockout_window);
- d_printf(_("%d seconds\n"), (int)t);
+ d_printf(_("%jd seconds\n"), (intmax_t)t);
} else {
d_printf(_("not set\n"));
}
@@ -325,8 +325,8 @@ static int account_set_resetduration(struct net_context *c,
}
unix_to_nt_time_abs(&i12->lockout_window, atoi(argv[0]));
- d_printf(_("Setting bad password reset duration to %d seconds\n"),
- (int)nt_time_to_unix_abs(&i12->lockout_window));
+ d_printf(_("Setting bad password reset duration to %jd seconds\n"),
+ (intmax_t)nt_time_to_unix_abs(&i12->lockout_window));
return 12;
}
@@ -386,8 +386,8 @@ static int account_set_maxpwage(struct net_context *c,
}
unix_to_nt_time_abs((NTTIME *)&i1->max_password_age, atoi(argv[0]));
- d_printf(_("Setting maximum password age to %d seconds\n"),
- (int)nt_time_to_unix_abs((NTTIME *)&i1->max_password_age));
+ d_printf(_("Setting maximum password age to %jd seconds\n"),
+ (intmax_t)nt_time_to_unix_abs((NTTIME
*)&i1->max_password_age));
return 1;
}
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index c1b56a5bfe4..65a5ae17596 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -492,15 +492,15 @@ static NTSTATUS fetch_cache_seqnum( struct
winbindd_domain *domain, time_t now )
time_diff = now - domain->last_seq_check;
if ((int)time_diff > lp_winbind_cache_time()) {
- DBG_DEBUG("fetch_cache_seqnum: timeout [%s][%u @ %u]\n",
+ DBG_DEBUG("fetch_cache_seqnum: timeout [%s][%u @ %jd]\n",
domain->name, domain->sequence_number,
- (uint32_t)domain->last_seq_check);
+ (intmax_t)domain->last_seq_check);
return NT_STATUS_UNSUCCESSFUL;
}
- DBG_DEBUG("fetch_cache_seqnum: success [%s][%u @ %u]\n",
+ DBG_DEBUG("fetch_cache_seqnum: success [%s][%u @ %jd]\n",
domain->name, domain->sequence_number,
- (uint32_t)domain->last_seq_check);
+ (intmax_t)domain->last_seq_check);
return NT_STATUS_OK;
}
--
Samba Shared Repository
