Merge remote branch 'sjmurdoch/cloexec' into cloexec

This commit is contained in:
Nick Mathewson
2010-11-21 17:01:30 -05:00
+2 -1
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();