From 0e08e63ae8bf4507779d6109e7f55da9d716053f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 Oct 2024 13:59:42 +0200 Subject: [PATCH] cldap: Save a few lines in cldap_netlogon MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Follow recent convention to write sync wrappers Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Fri Oct 25 09:04:11 UTC 2024 on atb-devel-224 --- libcli/cldap/cldap.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index cf8d020c5e3..022bb2bfa21 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -1069,7 +1069,7 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap, TALLOC_CTX *frame; struct tevent_req *req; struct tevent_context *ev; - NTSTATUS status; + NTSTATUS status = NT_STATUS_NO_MEMORY; if (cldap->searches.list) { return NT_STATUS_PIPE_BUSY; @@ -1083,29 +1083,22 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap, ev = samba_tevent_context_init(frame); if (ev == NULL) { - TALLOC_FREE(frame); - return NT_STATUS_NO_MEMORY; + goto done; } - req = cldap_netlogon_send(mem_ctx, ev, cldap, io); if (req == NULL) { - TALLOC_FREE(frame); - return NT_STATUS_NO_MEMORY; + goto done; } - if (!tevent_req_poll_ntstatus(req, ev, &status)) { - TALLOC_FREE(frame); - return status; + goto done; } - status = cldap_netlogon_recv(req, mem_ctx, io); if (!NT_STATUS_IS_OK(status)) { - TALLOC_FREE(frame); - return status; + goto done; } - +done: TALLOC_FREE(frame); - return NT_STATUS_OK; + return status; } -- 2.47.3