diff options
| author | dougb <dougb@FreeBSD.org> | 2009-01-09 11:45:45 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-01-09 11:45:45 +0000 |
| commit | b57ad9857ef69dc51d61f6167363313a8fe8e59f (patch) | |
| tree | f6ef8258cc0cdf0e2ea45ea074f80baffadb088b /contrib/bind9/lib/isc/unix/socket.c | |
| parent | 6d87547e6f4e20a83165353ea54122b55c85a3cf (diff) | |
| download | FreeBSD-src-b57ad9857ef69dc51d61f6167363313a8fe8e59f.zip FreeBSD-src-b57ad9857ef69dc51d61f6167363313a8fe8e59f.tar.gz | |
Merge from vendor/bind9/dist as of the 9.4.3-P1 import
Diffstat (limited to 'contrib/bind9/lib/isc/unix/socket.c')
| -rw-r--r-- | contrib/bind9/lib/isc/unix/socket.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/bind9/lib/isc/unix/socket.c b/contrib/bind9/lib/isc/unix/socket.c index 3239614..8b006e4 100644 --- a/contrib/bind9/lib/isc/unix/socket.c +++ b/contrib/bind9/lib/isc/unix/socket.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */ +/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */ /*! \file */ @@ -501,7 +501,7 @@ FIX_IPV6_RECVPKTINFO(isc_socket_t *sock) if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, (void *)&on, sizeof(on)) < 0) { - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVPKTINFO) " "%s: %s", sock->fd, @@ -3163,7 +3163,6 @@ watcher(void *uap) { ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(1), - ISC_LOG_INFO, "unexpected POLL timeout"); } pollstate = poll_active; @@ -4902,7 +4901,7 @@ isc_socket_ipv6only(isc_socket_t *sock, isc_boolean_t yes) { if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&onoff, sizeof(int)) < 0) { char strbuf[ISC_STRERRORSIZE]; - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_V6ONLY) " "%s: %s", sock->fd, |
