From: Volker Lendecke <vl@samba.org>
Date: Fri, 21 Jan 2022 19:21:17 +0000 (+0100)
Subject: libsmb: Avoid a call to SMBC_errno()
X-Git-Tag: tevent-0.12.0~767
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9030fb5a841a70eccd5a7a29029b3bc606832ea;p=thirdparty%2Fsamba.git

libsmb: Avoid a call to SMBC_errno()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 2b45faef0ae..d90d71134a8 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -402,6 +402,7 @@ SMBC_close_ctx(SMBCCTX *context,
                SMBCFILE *file)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
+	NTSTATUS status;
 
 	if (!context || !context->internal->initialized) {
 		errno = EINVAL;
@@ -421,19 +422,20 @@ SMBC_close_ctx(SMBCCTX *context,
 		return smbc_getFunctionClosedir(context)(context, file);
 	}
 
-	if (!NT_STATUS_IS_OK(cli_close(file->targetcli, file->cli_fd))) {
+	status = cli_close(file->targetcli, file->cli_fd);
+	if (!NT_STATUS_IS_OK(status)) {
 		SMBCSRV *srv;
 		DEBUG(3, ("cli_close failed on %s. purging server.\n",
 			  file->fname));
 		/* Deallocate slot and remove the server
 		 * from the server cache if unused */
-		errno = SMBC_errno(context, file->targetcli);
 		srv = file->srv;
 		DLIST_REMOVE(context->internal->files, file);
 		SAFE_FREE(file->fname);
 		SAFE_FREE(file);
 		smbc_getFunctionRemoveUnusedServer(context)(context, srv);
 		TALLOC_FREE(frame);
+		errno = cli_status_to_errno(status);
 		return -1;
 	}