From 9d856845d63784690e347c8e8dc013f1c830c86d Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 3 Nov 2009 04:39:41 +0000
Subject: [PATCH] 2744.  [func]          Log if a query was over TCP. [RT
 #19961]

---
 CHANGES                 |  2 ++
 bin/named/query.c       |  6 ++++--
 doc/arm/Bv9ARM-book.xml | 11 ++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 07cb1231e0..9b218c20dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2744.	[func]		Log if a query was over TCP. [RT #19961]
+
 2743.	[bug]		RRSIG could be incorrectly set in the NSEC3 record
 			for a insecure delegation.
 
diff --git a/bin/named/query.c b/bin/named/query.c
index d24b2f85ed..4d08c90da3 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.330 2009/10/26 23:47:35 tbox Exp $ */
+/* $Id: query.c,v 1.331 2009/11/03 04:39:41 marka Exp $ */
 
 /*! \file */
 
@@ -5073,10 +5073,12 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) {
 	isc_netaddr_format(&client->destaddr, onbuf, sizeof(onbuf));
 
 	ns_client_log(client, NS_LOGCATEGORY_QUERIES, NS_LOGMODULE_QUERY,
-		      level, "query: %s %s %s %s%s%s%s%s (%s)", namebuf,
+		      level, "query: %s %s %s %s%s%s%s%s%s (%s)", namebuf,
 		      classname, typename, WANTRECURSION(client) ? "+" : "-",
 		      (client->signer != NULL) ? "S": "",
 		      (client->opt != NULL) ? "E" : "",
+		      ((client->attributes & NS_CLIENTATTR_TCP) != 0) ?
+				 "T" : "",
 		      ((extflags & DNS_MESSAGEEXTFLAG_DO) != 0) ? "D" : "",
 		      ((flags & DNS_MESSAGEFLAG_CD) != 0) ? "C" : "",
 		      onbuf);
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 9ea53bccd9..81665e8e7b 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.440 2009/10/26 23:14:53 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.441 2009/11/03 04:39:41 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -4411,10 +4411,11 @@ category notify { null; };
 		      class and type.  Next it reports whether the
 		      Recursion Desired flag was set (+ if set, -
 		      if not set), if the query was signed (S),
-		      EDNS was in use (E), if DO (DNSSEC Ok) was
-		      set (D), or if CD (Checking Disabled) was set
-		      (C).  After this the destination address the
-		      query was sent to is reported.
+		      EDNS was in use (E), if TCP was used (T), if
+		      DO (DNSSEC Ok) was set (D), or if CD (Checking
+		      Disabled) was set (C).  After this the
+		      destination address the query was sent to is
+		      reported.
 		    </para>
 
                     <para>