[2565] Fix exception message returned when classes don't match

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index 5bbd545e78c85b17163c5ebaffc980b4f08be2ad..4abc15e0cf347f5db939ae442c2649ca153a091b 100644 (file)
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -214,8 +214,8 @@ private:
             RRClass::createFromText(rrparam_token.getString());
         if (rrclass) {
             if (*rrclass != zone_class_) {
-                isc_throw(InternalException, "Class mismatch: " << rrclass <<
-                          "vs. " << zone_class_);
+                isc_throw(InternalException, "Class mismatch: " << *rrclass <<
+                          " vs. " << zone_class_);
             }
             rrparam_token = lexer_.getNextToken(MasterToken::STRING);
         }

diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index 667706aa348e12bf85d2d48c953d44c885cd1fef..3f3314c3471bc99a09734d627c0109539c4758d2 100644 (file)
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -391,7 +391,8 @@ struct ErrorCase {
       "Missing Rdata" },
 
     { "www      3600    IN", NULL, "Unexpected EOLN" },
-    { "www      3600    CH  TXT nothing", NULL, "Class mismatch" },
+    { "www      3600    CH  TXT nothing", "Class mismatch: CH vs. IN",
+      "Class mismatch" },
     { "www      \"3600\"  IN  A   192.0.2.1", NULL, "Quoted TTL" },
     { "www      3600    \"IN\"  A   192.0.2.1", NULL, "Quoted class" },
     { "www      3600    IN  \"A\"   192.0.2.1", NULL, "Quoted type" },