The branch, master has been updated
via cf4f13f6830 smbd: Fixing CID 1509052 for time_t in DEBUG statement
via 479da134e0f libsmb: Fixing CID 1509051 for time_t in DEBUG statement
via f35aacbb17e nmbd: Fixing CID 1509046 for time_t in DEBUG statement
via 52d5d4ddcd0 buildtools: fixed broken build with FIPS-enabled host
from 1ec54347aca smbd: Fix CID 1665417, UNUSED_VALUE in
openat_pathref_fsp_dot()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cf4f13f6830703eeec485c88a26f0d88dd473939
Author: Rabinarayan Panigrahi <[email protected]>
Date: Mon Sep 1 11:51:09 2025 +0530
smbd: Fixing CID 1509052 for time_t in DEBUG statement
Fix: typecast changing from (unsigned)convert_timespec_to_time_t to
(intmax_t)convert_timespec_to_time_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Reviewed-by: Vinit Agnihotri <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Anoop C S <[email protected]>
Autobuild-Date(master): Tue Sep 16 17:45:30 UTC 2025 on atb-devel-224
commit 479da134e0f95559411f9310af335ec8e3e50752
Author: Rabinarayan Panigrahi <[email protected]>
Date: Mon Sep 1 12:39:07 2025 +0530
libsmb: Fixing CID 1509051 for time_t in DEBUG statement
Fix: typecast changing from (unsigned int)expire to
(intmax_t)expire as intmax_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Reviewed-by: Vinit Agnihotri <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit f35aacbb17ead6b33da8d33ff5652c7bc1c3a451
Author: Rabinarayan Panigrahi <[email protected]>
Date: Mon Sep 1 14:09:33 2025 +0530
nmbd: Fixing CID 1509046 for time_t in DEBUG statement
Fix: typecast changing from (int)browc->death_time to
(intmax_t)browc->death_time as intmax_t can hold epoch seconds
after 2038 year
Signed-off-by: Rabinarayan Panigrahi <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Reviewed-by: Vinit Agnihotri <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 52d5d4ddcd014f5095ceedf34c660338dc4a8914
Author: Shachar Sharon <[email protected]>
Date: Thu Aug 7 16:42:07 2025 +0300
buildtools: fixed broken build with FIPS-enabled host
MD5 is not supported on FIPS-enabled machines, but the current
work-around is broken. One the other hand, latest Waf has proper
fixup (use sha1 as a replacement to md5) so there is no need for Samba
specific code.
Tested on CentOS-stream-9 with FIPS (Python-3.9.23).
Signed-off-by: Shachar Sharon <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_utils.py | 37 -------------------------------------
source3/libsmb/namequery.c | 4 ++--
source3/nmbd/nmbd_browserdb.c | 4 ++--
source3/smbd/smb2_trans2.c | 4 ++--
4 files changed, 6 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index 1776fcee965..548e21b4a26 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -360,43 +360,6 @@ def RUN_PYTHON_TESTS(testfiles, pythonpath=None,
extra_env=None):
return result
-# make sure we have md5. some systems don't have it
-try:
- from hashlib import md5
- # Even if hashlib.md5 exists, it may be unusable.
- # Try to use MD5 function. In FIPS mode this will cause an exception
- # and we'll get to the replacement code
- foo = md5(b'abcd')
-except:
- try:
- import md5
- # repeat the same check here, mere success of import is not enough.
- # Try to use MD5 function. In FIPS mode this will cause an exception
- foo = md5.md5(b'abcd')
- except:
- Context.SIG_NIL = hash('abcd')
- class replace_md5(object):
- def __init__(self):
- self.val = None
- def update(self, val):
- self.val = hash((self.val, val))
- def digest(self):
- return str(self.val)
- def hexdigest(self):
- return self.digest().encode('hex')
- def replace_h_file(filename):
- f = open(filename, 'rb')
- m = replace_md5()
- while (filename):
- filename = f.read(100000)
- m.update(filename)
- f.close()
- return m.digest()
- Utils.md5 = replace_md5
- Task.md5 = replace_md5
- Utils.h_file = replace_h_file
-
-
def LOAD_ENVIRONMENT():
'''load the configuration environment, allowing access to env vars
from new commands'''
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 0b762af64af..dabb0e4b42b 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -184,8 +184,8 @@ bool saf_join_store( const char *domain, const char
*servername )
}
expire = time( NULL ) + lp_parm_int(-1, "saf","join ttl", SAFJOIN_TTL);
- DEBUG(10,("saf_join_store: domain = [%s], server = [%s], expire =
[%u]\n",
- domain, servername, (unsigned int)expire ));
+ DEBUG(10,("saf_join_store: domain = [%s], server = [%s], expire =
[%jd]\n",
+ domain, servername, (intmax_t)expire ));
ret = gencache_set( key, servername, expire );
diff --git a/source3/nmbd/nmbd_browserdb.c b/source3/nmbd/nmbd_browserdb.c
index b5fdbab95c6..3d663b2fbae 100644
--- a/source3/nmbd/nmbd_browserdb.c
+++ b/source3/nmbd/nmbd_browserdb.c
@@ -125,8 +125,8 @@ struct browse_cache_record *create_browser_in_lmb_cache(
const char *work_name,
DEBUG(3, ("nmbd_browserdb:create_browser_in_lmb_cache()\n"));
DEBUGADD(3, (" Added lmb cache entry for workgroup %s name %s IP %s "
- "ttl %d\n", browc->work_group, browc->lmb_name,
- inet_ntoa(ip), (int)browc->death_time));
+ "ttl %jd\n", browc->work_group, browc->lmb_name,
+ inet_ntoa(ip), (intmax_t)browc->death_time));
return( browc );
}
diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index deb371beaba..d4ef3bb1c1f 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -2113,9 +2113,9 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n",
(unsigned int)st.st_ex_dev, (u
}
SCVAL(pdata,l2_vol_cch,len);
data_len = l2_vol_szVolLabel + len;
- DEBUG(5,("smbd_do_qfsinfo : time = %x, namelen = %u, "
+ DEBUG(5,("smbd_do_qfsinfo : time = %jx, namelen = %u, "
"name = %s serial = 0x%04"PRIx32"\n",
-
(unsigned)convert_timespec_to_time_t(st.st_ex_ctime),
+
(intmax_t)convert_timespec_to_time_t(st.st_ex_ctime),
(unsigned)len, vname, serial));
break;
--
Samba Shared Repository
