faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: add debug messages to UTI_FdSetCloexec()

Browse source
This commit is contained in:
Miroslav Lichvar 2019-08-08 17:32:23 +02:00
parent 3038047f9b
commit 622769cdfd
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
socket.c
View file

@ -187,7 +187,6 @@ open_socket(int domain, int type, int flags)
(socket_flags & SOCK_CLOEXEC) == 0 && (socket_flags & SOCK_CLOEXEC) == 0 &&
#endif #endif
!UTI_FdSetCloexec(sock_fd)) { !UTI_FdSetCloexec(sock_fd)) {
DEBUG_LOG("Could not set O_CLOEXEC : %s", strerror(errno));
close(sock_fd); close(sock_fd);
return INVALID_SOCK_FD; return INVALID_SOCK_FD;
} }

15
util.c
View file

@ -888,12 +888,19 @@ UTI_FdSetCloexec(int fd)
int flags; int flags;
flags = fcntl(fd, F_GETFD); flags = fcntl(fd, F_GETFD);
if (flags != -1) { if (flags == -1) {
flags |= FD_CLOEXEC; DEBUG_LOG("fcntl() failed : %s", strerror(errno));
return !fcntl(fd, F_SETFD, flags); return 0;
} }
return 0; flags |= FD_CLOEXEC;
if (fcntl(fd, F_SETFD, flags) < 0) {
DEBUG_LOG("fcntl() failed : %s", strerror(errno));
return 0;
}
return 1;
} }
/* ================================================== */ /* ================================================== */