From 5f7516bee5ace9542701f23fc7723a3e3196802a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 9 Oct 2001 02:39:03 +0000
Subject: [PATCH] 1035.   [bug]           Respond to multicast queries from a
 unicast address,                         RFC 1123. [RT #137]

---
 CHANGES            | 3 +++
 bin/named/client.c | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 047c416ea1..76c39ab238 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1035.	[bug]		Respond to multicast queries from a unicast address,
+			RFC 1123. [RT #137]
+
 1034.	[bug]		Multicast queries must not have RD set, RFC 1123.
 			FORMERR those that do.  [RT #137]
 
diff --git a/bin/named/client.c b/bin/named/client.c
index 98edf1c47e..ec8bea94c3 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.181 2001/10/09 02:30:20 marka Exp $ */
+/* $Id: client.c,v 1.182 2001/10/09 02:39:03 marka Exp $ */
 
 #include <config.h>
 
@@ -734,7 +734,8 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) {
 		sockflags |= ISC_SOCKFLAG_NORETRY;
 	}
 
-	if ((client->attributes & NS_CLIENTATTR_PKTINFO) != 0)
+	if ((client->attributes & NS_CLIENTATTR_PKTINFO) != 0 &&
+	    (client->attributes |= NS_CLIENTATTR_MULTICAST) == 0)
 		pktinfo = &client->pktinfo;
 	else
 		pktinfo = NULL;