BIND 10 trac2428, updated. bb1f38e03fb01fb164a58d91bd96bc9fcf4c07df [2428] Test two more error cases

[BIND 10 source code commits]

The branch, trac2428 has been updated
       via  bb1f38e03fb01fb164a58d91bd96bc9fcf4c07df (commit)
       via  58664e2ecc10b71b6ce0126ccf8c5f336f7cd380 (commit)
      from  443cabc1e4a305f19b39bcbdb66c0bde010c93ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb1f38e03fb01fb164a58d91bd96bc9fcf4c07df
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Dec 13 12:12:37 2012 +0100

    [2428] Test two more error cases
    
    Shorter and longer version of INCLUDE.

commit 58664e2ecc10b71b6ce0126ccf8c5f336f7cd380
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Dec 13 12:09:17 2012 +0100

    [2428] Put internal exception to anonymous namespace

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/master_loader.cc                |    4 ++++
 src/lib/dns/tests/master_loader_unittest.cc |    2 ++
 2 files changed, 6 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index f31d9bf..9a7f1ee 100644
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -31,6 +31,8 @@ using boost::algorithm::iequals;
 namespace isc {
 namespace dns {
 
+namespace {
+
 // An internal exception, used to control the code flow in case of errors.
 // It is thrown during the loading and caught later, not to be propagated
 // outside of the file.
@@ -41,6 +43,8 @@ public:
     {}
 };
 
+}
+
 class MasterLoader::MasterLoaderImpl {
 public:
     MasterLoaderImpl(const char* master_file,
diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index 7037557..e690943 100644
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -283,6 +283,8 @@ struct ErrorCase {
     // Check the unknown directive. The rest looks like ordinary RR,
     // so we see the $ is actually special.
     { "$UNKNOWN 3600    IN  A   192.0.2.1", "Unknown $ directive" },
+    { "$INCLUD " TEST_DATA_SRCDIR "/example.org", "Include too short" },
+    { "$INCLUDES " TEST_DATA_SRCDIR "/example.org", "Include too short" },
     { "$INCLUDE", "Missing include path" },
     { "$INCLUDE /file/not/found", "Include file not found" },
     { "$INCLUDE /file/not/found and here goes bunch of garbage",