From 186d27dcc3475ffe87facb34ad7cd982ea51ccd6 Mon Sep 17 00:00:00 2001 From: guenther Date: Wed, 9 Sep 2015 15:40:04 +0000 Subject: Use SOCK_NONBLOCK in a couple more places ok deraadt@ --- lib/libc/asr/res_send_async.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'lib/libc/asr/res_send_async.c') diff --git a/lib/libc/asr/res_send_async.c b/lib/libc/asr/res_send_async.c index 3404b79c802..52dd5ed84e1 100644 --- a/lib/libc/asr/res_send_async.c +++ b/lib/libc/asr/res_send_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_send_async.c,v 1.23 2015/06/20 01:16:25 jca Exp $ */ +/* $OpenBSD: res_send_async.c,v 1.24 2015/09/09 15:40:04 guenther Exp $ */ /* * Copyright (c) 2012 Eric Faurot * @@ -301,17 +301,9 @@ res_send_async_run(struct asr_query *as, struct asr_result *ar) static int sockaddr_connect(const struct sockaddr *sa, int socktype) { - int errno_save, flags, sock; + int errno_save, sock; - if ((sock = socket(sa->sa_family, socktype, 0)) == -1) - goto fail; - - if ((flags = fcntl(sock, F_GETFL, 0)) == -1) - goto fail; - - flags |= O_NONBLOCK; - - if ((flags = fcntl(sock, F_SETFL, flags)) == -1) + if ((sock = socket(sa->sa_family, socktype | SOCK_NONBLOCK, 0)) == -1) goto fail; if (connect(sock, sa, sa->sa_len) == -1) { -- cgit v1.2.3-59-g8ed1b