From ca4723bccbd97ca32bb6d1e8599873fd8ddb4609 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 10 Jul 2002 05:10:35 +0000
Subject: [PATCH] 1279.   [bug]           libbind: get_salen() IPv6 support was
 broken for OSs                         w/o sa_len.

---
 CHANGES                    |  3 +++
 lib/bind/resolv/res_send.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 99e7289b71..ed09671bbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,9 @@
 
 1282.	[bug]		ns_server_destroy() failed to set *serverp to NULL.
 
+1279.	[bug]		libbind: get_salen() IPv6 support was broken for OSs
+			w/o sa_len.
+
 1278.	[bug]		libbind: res_nametotype() and res_nametoclass() were
 			broken.
 
diff --git a/lib/bind/resolv/res_send.c b/lib/bind/resolv/res_send.c
index 85fb4be7e4..967f3b13c3 100644
--- a/lib/bind/resolv/res_send.c
+++ b/lib/bind/resolv/res_send.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5 2001/07/03 06:49:55 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.1 2002/07/10 05:10:35 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -521,17 +521,17 @@ get_salen(sa)
 {
 
 #ifdef HAVE_SA_LEN
-	/* there are people do not set sa_len.  be forgibing to them */
+	/* There are people do not set sa_len.  Be forgiving to them. */
 	if (sa->sa_len)
-		return sa->sa_len;
+		return (sa->sa_len);
 #endif
 
 	if (sa->sa_family == AF_INET)
-		return sizeof(struct sockaddr_in);
-	else if (sa->sa_family == AF_INET)
-		return sizeof(struct sockaddr_in6);
+		return (sizeof(struct sockaddr_in));
+	else if (sa->sa_family == AF_INET6)
+		return (sizeof(struct sockaddr_in6));
 	else
-		return 0;	/* unknown, die on connect */
+		return (0);	/* unknown, die on connect */
 }
 
 /*