From: Mukund Sivaraman Date: Thu, 27 Dec 2012 11:08:37 +0000 (+0530) Subject: [2565] Fix exception message returned when classes don't match X-Git-Tag: bind10-1.0.0-rc-release~95^2~21^2~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=857d7fbf031d29b5b66ebe38fec725dde35008fd;p=thirdparty%2Fkea.git [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 5bbd545e78..4abc15e0cf 100644 --- 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 667706aa34..3f3314c347 100644 --- 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" },