From: Mark Andrews <marka@isc.org>
Date: Fri, 29 Jul 2011 02:19:20 +0000 (+0000)
Subject: missing isc__strerror on error paths
X-Git-Tag: v9.8.1rc1~23
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=aac095f12ac500973698089754726256342c2d4e;p=thirdparty%2Fbind9.git

missing isc__strerror on error paths
---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 837e67640c2..36269c6ca30 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.333.14.8 2011/07/28 04:30:54 marka Exp $ */
+/* $Id: socket.c,v 1.333.14.9 2011/07/29 02:19:20 marka Exp $ */
 
 /*! \file */
 
@@ -764,6 +764,7 @@ FIX_IPV6_RECVPKTINFO(isc__socket_t *sock)
 	if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
 		       (void *)&on, sizeof(on)) < 0) {
 
+		isc__strerror(errno, strbuf, sizeof(strbuf));
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "setsockopt(%d, IPV6_RECVPKTINFO) "
 				 "%s: %s", sock->fd,
@@ -2458,8 +2459,9 @@ opensocket(isc__socketmgr_t *manager, isc__socket_t *sock) {
 		 */
 		if (sock->pf == AF_INET6) {
 			int action = IPV6_PMTUDISC_DONT;
-			(void)setsockopt(sock->fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
-					 &action, sizeof(action));
+			(void)setsockopt(sock->fd, IPPROTO_IPV6,
+					 IPV6_MTU_DISCOVER, &action,
+					 sizeof(action));
 		}
 #endif
 #endif /* ISC_PLATFORM_HAVEIPV6 */
@@ -5664,7 +5666,7 @@ isc__socket_ipv6only(isc_socket_t *sock0, isc_boolean_t yes) {
 		if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY,
 			       (void *)&onoff, sizeof(int)) < 0) {
 			char strbuf[ISC_STRERRORSIZE];
-
+			isc__strerror(errno, strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "setsockopt(%d, IPV6_V6ONLY) "
 					 "%s: %s", sock->fd,