diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
| commit | 887eba98950f2974bd2031510e1ece2279a4f106 (patch) | |
| tree | 0bda88092333a1aa21925033596f395df4e3d4b1 /src/ext/eventdns.c | |
| parent | fcd9248387249d68619734a73860ffaab12b021b (diff) | |
| parent | 6acf0ac2851fb95953edea9c231d82f487f28c3d (diff) | |
| download | tor-887eba98950f2974bd2031510e1ece2279a4f106.tar.gz tor-887eba98950f2974bd2031510e1ece2279a4f106.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
Diffstat (limited to 'src/ext/eventdns.c')
| -rw-r--r-- | src/ext/eventdns.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 3ee9f72459..66280cccdb 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2306,7 +2306,12 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, ioctlsocket(ns->socket, FIONBIO, &nonblocking); } #else - fcntl(ns->socket, F_SETFL, O_NONBLOCK); + if (fcntl(ns->socket, F_SETFL, O_NONBLOCK) == -1) { + evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while settings file status flags.", + tor_socket_strerror(errno), errno); + err = 2; + goto out2; + } #endif if (global_bind_addr_is_set && |