about summary refs log tree commit diff
path: root/src/network
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-09-29 17:59:50 -0400
committerRich Felker <dalias@aerifal.cx>2012-09-29 17:59:50 -0400
commitf2d08cf7558176af7ef36cf5b5213e676b02d7ac (patch)
treedc3d0d1d9d1a29864c1278828bb0e16b7482d708 /src/network
parent3609e019f352912e882b91b7a856c7b30569f2de (diff)
downloadmusl-f2d08cf7558176af7ef36cf5b5213e676b02d7ac.tar.gz
musl-f2d08cf7558176af7ef36cf5b5213e676b02d7ac.tar.xz
musl-f2d08cf7558176af7ef36cf5b5213e676b02d7ac.zip
fix some more O_CLOEXEC/SOCK_CLOEXEC issues
Diffstat (limited to 'src/network')
-rw-r--r--src/network/__dns.c4
1 files changed, 1 insertions, 3 deletions
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;