The branch, master has been updated
via ae9a56901e0 smbd: Fix CID 1664060: Incorrect expression
(IDENTICAL_BRANCHES)
via c7d5f558644 tldap: Fix CID 1664062: Error handling issues
(CHECKED_RETURN)
from 66968d4d7a2 pdb_ldap: Fix memory leak CID#1363095
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ae9a56901e03766568c88ad93c3132ae53b5fdb0
Author: Volker Lendecke <[email protected]>
Date: Mon Aug 18 10:46:21 2025 +0200
smbd: Fix CID 1664060: Incorrect expression (IDENTICAL_BRANCHES)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Reviewed-by: Günther Deschner <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Aug 18 13:04:27 UTC 2025 on atb-devel-224
commit c7d5f5586443dde32a5b9c80e6abbbd580529ef2
Author: Volker Lendecke <[email protected]>
Date: Mon Aug 18 10:44:46 2025 +0200
tldap: Fix CID 1664062: Error handling issues (CHECKED_RETURN)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Reviewed-by: Günther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/tldap.c | 8 +++++++-
source3/smbd/smbXsrv_open.c | 4 ----
2 files changed, 7 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 7b1d04064e2..e003fe15f6e 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1907,8 +1907,14 @@ struct tevent_req *tldap_search_send(TALLOC_CTX *mem_ctx,
}
if (timelimit != 0) {
struct timeval end;
+ bool ok;
+
end = timeval_current_ofs(timelimit * 1.5F, 0);
- tevent_req_set_endtime(subreq, ev, end);
+ ok = tevent_req_set_endtime(subreq, ev, end);
+ if (!ok) {
+ tevent_req_oom(req);
+ return tevent_req_post(req, ev);
+ }
}
tevent_req_set_callback(subreq, tldap_search_done, req);
return req;
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 56e94c6f4d6..17424300f12 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -307,10 +307,6 @@ static void smbXsrv_open_global_lookup_fn(struct db_record
*rec,
key,
val,
&state->global);
- if (!NT_STATUS_IS_OK(state->status)) {
- return;
- }
- return;
}
static NTSTATUS smbXsrv_open_global_lookup(
--
Samba Shared Repository
