From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 17 Feb 2021 11:14:06 +0000 (+0100)
Subject: swrap: remember the libc_close() errno in swrap_close()
X-Git-Tag: socket_wrapper-1.3.3~9
X-Git-Url: http://git.samba.org/?p=socket_wrapper.git;a=commitdiff_plain;h=d28fdbf203976290e6ba97577e1979df8f99bb61

swrap: remember the libc_close() errno in swrap_close()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14640

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 3bf60f1..61dce97 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -7421,6 +7421,7 @@ static int swrap_close(int fd)
 {
 	struct socket_info *si = NULL;
 	int si_index;
+	int ret_errno = errno;
 	int ret;
 
 	swrap_mutex_lock(&socket_reset_mutex);
@@ -7440,6 +7441,9 @@ static int swrap_close(int fd)
 	SWRAP_LOCK_SI(si);
 
 	ret = libc_close(fd);
+	if (ret == -1) {
+		ret_errno = errno;
+	}
 
 	swrap_dec_refcount(si);
 
@@ -7474,6 +7478,7 @@ out:
 	swrap_mutex_unlock(&first_free_mutex);
 	swrap_mutex_unlock(&socket_reset_mutex);
 
+	errno = ret_errno;
 	return ret;
 }