summaryrefslogtreecommitdiff
path: root/src/libstddjb/socket_deadlineconnstamp6.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-07-30 14:05:39 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-07-30 14:05:39 +0000
commit3c5f5aea891c85dbdfc4d287d7ebf2bb813d6405 (patch)
treeb027104ec049bf42447fc4ca41173f333b1d528a /src/libstddjb/socket_deadlineconnstamp6.c
parent2858f5c4b1fe40d0970b18e8d155acf3d900ab6e (diff)
downloadskalibs-3c5f5aea891c85dbdfc4d287d7ebf2bb813d6405.tar.xz
Fix a case where socket_deadlineconnstamp* could modify errno on success (thanks jlyo)
Diffstat (limited to 'src/libstddjb/socket_deadlineconnstamp6.c')
-rw-r--r--src/libstddjb/socket_deadlineconnstamp6.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstddjb/socket_deadlineconnstamp6.c b/src/libstddjb/socket_deadlineconnstamp6.c
index 656a2d1..d03fabe 100644
--- a/src/libstddjb/socket_deadlineconnstamp6.c
+++ b/src/libstddjb/socket_deadlineconnstamp6.c
@@ -6,7 +6,9 @@
int socket_deadlineconnstamp6 (int s, char const *ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
{
+ int e = errno ;
if (socket_connect6(s, ip, port) >= 0) return 1 ;
if (!error_isagain(errno) && !error_isalready(errno)) return 0 ;
+ errno = e ;
return socket_waitconn(s, deadline, stamp) ;
}