Don't both open the socket with SOCK_CLOEXEC and set FD_CLOEXEC

This commit is contained in:
Steven Murdoch 2010-11-21 15:40:17 +00:00
parent 9d63dfcf49
commit 15f2b7859b

View File

@ -935,11 +935,12 @@ tor_open_socket(int domain, int type, int protocol)
{
int s;
#ifdef SOCK_CLOEXEC
#define LINUX_CLOEXEC_OPEN_SOCKET
type |= SOCK_CLOEXEC;
#endif
s = socket(domain, type, protocol);
if (s >= 0) {
#ifdef FD_CLOEXEC
#if !defined(LINUX_CLOEXEC_OPEN_SOCKET) && defined(FD_CLOEXEC)
fcntl(s, F_SETFD, FD_CLOEXEC);
#endif
socket_accounting_lock();