From f2d08cf7558176af7ef36cf5b5213e676b02d7ac Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 29 Sep 2012 17:59:50 -0400 Subject: fix some more O_CLOEXEC/SOCK_CLOEXEC issues --- src/network/__dns.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/__dns.c b/src/network/__dns.c index 1464513d..372a5871 100644 --- a/src/network/__dns.c +++ b/src/network/__dns.c @@ -91,7 +91,7 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt) /* Get local address and open/bind a socket */ sa.sin.sin_family = family; - fd = socket(family, SOCK_DGRAM, 0); + fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); pthread_cleanup_push(cleanup, (void *)(intptr_t)fd); pthread_setcancelstate(cs, 0); @@ -100,8 +100,6 @@ int __dns_doqueries(unsigned char *dest, const char *name, int *rr, int rrcnt) errcode = EAI_SYSTEM; goto out; } - /* Nonblocking to work around Linux UDP select bug */ - fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK); pfd.fd = fd; pfd.events = POLLIN; -- cgit v1.2.1