BIND 10 trac2832, updated. 754c38ee58da3a9d9667072c16b58ab53d45e368 [2832] roll back all of 946b1df except typo fix

[BIND 10 source code commits]

The branch, trac2832 has been updated
       via  754c38ee58da3a9d9667072c16b58ab53d45e368 (commit)
      from  946b1dfec880e605bc154bc963f4b3bd860c1b55 (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 754c38ee58da3a9d9667072c16b58ab53d45e368
Author: Paul Selkirk <pselkirk at isc.org>
Date:   Fri Apr 12 23:37:52 2013 -0400

    [2832] roll back all of 946b1df except typo fix

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

Summary of changes:
 src/lib/datasrc/cache_config.cc                |    6 +-----
 src/lib/datasrc/tests/cache_config_unittest.cc |    7 -------
 2 files changed, 1 insertion(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/cache_config.cc b/src/lib/datasrc/cache_config.cc
index b1d583f..378e5e6 100644
--- a/src/lib/datasrc/cache_config.cc
+++ b/src/lib/datasrc/cache_config.cc
@@ -42,11 +42,7 @@ getSegmentTypeFromConf(const Element& conf) {
     if (!conf.contains("cache-type")) {
         return ("local");
     }
-    std::string cache_type = conf.get("cache-type")->stringValue();
-    if ((cache_type != "local") && (cache_type != "mapped")) {
-        isc_throw(CacheConfigError, "invalid cache-type");
-    }
-    return (cache_type);
+    return (conf.get("cache-type")->stringValue());
 }
 }
 
diff --git a/src/lib/datasrc/tests/cache_config_unittest.cc b/src/lib/datasrc/tests/cache_config_unittest.cc
index cce2462..8c266ec 100644
--- a/src/lib/datasrc/tests/cache_config_unittest.cc
+++ b/src/lib/datasrc/tests/cache_config_unittest.cc
@@ -238,13 +238,6 @@ TEST_F(CacheConfigTest, getSegmentType) {
                                                 " \"params\": {}}"));
     EXPECT_THROW(CacheConfig("MasterFiles", 0, *badconfig, true),
                  isc::data::TypeError);
-
-    // Bad value: should be rejected at construction time
-    ConstElementPtr badconfig2(Element::fromJSON("{\"cache-enable\": true,"
-                                                " \"cache-type\": \"bogus\","
-                                                " \"params\": {}}"));
-    EXPECT_THROW(CacheConfig("MasterFiles", 0, *badconfig2, true),
-                 isc::datasrc::internal::CacheConfigError);
 }
 
 }