From: Mark Andrews <marka@isc.org>
Date: Thu, 12 Sep 2002 04:42:46 +0000 (+0000)
Subject: report type and class when logging failures via add_bad
X-Git-Tag: v9.2.3rc1~104^2~322
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=acfbd7a47859bf51b94e99925e1ab74ddf252931;p=thirdparty%2Fbind9.git

report type and class when logging failures via add_bad
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 2c35a6736cd..b2fd1f9d73f 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.251 2002/09/10 00:53:30 marka Exp $ */
+/* $Id: resolver.c,v 1.252 2002/09/12 04:42:46 marka Exp $ */
 
 #include <config.h>
 
@@ -37,6 +37,7 @@
 #include <dns/peer.h>
 #include <dns/rcode.h>
 #include <dns/rdata.h>
+#include <dns/rdataclass.h>
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>
 #include <dns/rdatastruct.h>
@@ -1331,6 +1332,8 @@ static void
 add_bad(fetchctx_t *fctx, isc_sockaddr_t *address, isc_result_t reason) {
 	char namebuf[DNS_NAME_FORMATSIZE];
 	char addrbuf[ISC_SOCKADDR_FORMATSIZE];
+	char classbuf[64];
+	char typebuf[64];
 	char code[64];
 	isc_buffer_t b;
 	isc_sockaddr_t *sa;
@@ -1372,12 +1375,14 @@ add_bad(fetchctx_t *fctx, isc_sockaddr_t *address, isc_result_t reason) {
 		sep2 = "";
 	}
 	dns_name_format(&fctx->name, namebuf, sizeof(namebuf));
+	dns_rdatatype_format(fctx->type, typebuf, sizeof(typebuf));
+	dns_rdataclass_format(fctx->res->rdclass, classbuf, sizeof(classbuf));
 	isc_sockaddr_format(address, addrbuf, sizeof(addrbuf));
 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS,
 		      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
-		      "%s %s%s%sresolving '%s': %s",
+		      "%s %s%s%sresolving '%s/%s/%s': %s",
 		      dns_result_totext(reason), sep1, code, sep2,
-		      namebuf, addrbuf);
+		      namebuf, typebuf, classbuf, addrbuf);
 }
 
 static void