summaryrefslogtreecommitdiff
path: root/src/socket.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2023-12-17 14:18:49 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2023-12-17 14:18:49 +0100
commit96da31f8cb9ec57313ab496a9ce07b108ec3914f (patch)
tree18ce4d6e2adcf5303c77cc03c9c468a7afa251f9 /src/socket.c
parent5400fb6e98435efe682b4a9de7266579b634de3c (diff)
parenteece9692d707ccb20356ec06955f8308c4e59ca7 (diff)
Update upstream source from tag 'upstream/4.19'
Update to upstream version '4.19' with Debian dir a79aeedeffb7d90638e4dcbdae78296b59e0c285
Diffstat (limited to 'src/socket.c')
-rw-r--r--src/socket.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/socket.c b/src/socket.c
index e2ad9ed..9fdd903 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -394,13 +394,15 @@ EXPORT_SYMBOL int HX_socket_from_env(const struct addrinfo *ai, const char *intf
}
top_fd = x;
}
- for (int fd = 3; fd < top_fd; ++fd)
- if (try_sk_from_env(fd, ai, intf) == fd) {
+ for (int fd = 3; fd < top_fd; ++fd) {
+ if (try_sk_from_env(fd, ai, intf) != fd)
+ continue;
#ifdef SOCK_CLOEXEC
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
+ if (fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0) | FD_CLOEXEC) != 0)
+ /* ignore */;
#endif
- return fd;
- }
+ return fd;
+ }
errno = ENOENT;
return -1;
}