diff options
| author | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2010-11-21 15:40:17 +0000 |
|---|---|---|
| committer | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2010-11-21 15:40:17 +0000 |
| commit | 15f2b7859bbf66ca74cc240e89ba02c81d95cb02 (patch) | |
| tree | b71bb11fbbe62218f369f937b255685f355ef3f3 /src | |
| parent | 9d63dfcf49924fad573109c80dfa881c19cfe195 (diff) | |
| download | tor-15f2b7859bbf66ca74cc240e89ba02c81d95cb02.tar.gz tor-15f2b7859bbf66ca74cc240e89ba02c81d95cb02.zip | |
Don't both open the socket with SOCK_CLOEXEC and set FD_CLOEXEC
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 07d961812c..56315e5079 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -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(); |