From efb79bb638d7c88d3f46c9486d7f29f2d2e6e8df Mon Sep 17 00:00:00 2001
From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 4 Apr 2012 10:11:36 -0700
Subject: [PATCH] [1788] removed the default for 'filetype' from the spec file.

for optional items setting the default doesn't make sense, but we also have
test cases where syntax validation is skipped, so changing it to non-optional
will break existing test cases.  at least for now, it seems to make most sense
to keep it optional and define the default within the parser code.
---
 src/bin/auth/auth.spec.pre.in | 3 +--
 src/bin/auth/auth_config.cc   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/bin/auth/auth.spec.pre.in b/src/bin/auth/auth.spec.pre.in
index 71f4863a2d..3eeb35e0cd 100644
--- a/src/bin/auth/auth.spec.pre.in
+++ b/src/bin/auth/auth.spec.pre.in
@@ -50,8 +50,7 @@
               },
               { "item_name": "filetype",
                 "item_type": "string",
-                "item_optional": true,
-                "item_default": "text"
+                "item_optional": true
               }]
             }
           }]
diff --git a/src/bin/auth/auth_config.cc b/src/bin/auth/auth_config.cc
index af7ae0aed7..3b391d3da5 100644
--- a/src/bin/auth/auth_config.cc
+++ b/src/bin/auth/auth_config.cc
@@ -165,7 +165,6 @@ MemoryDatasourceConfig::build(ConstElementPtr config_value) {
             isc_throw(AuthConfigError, "Missing zone file for zone: "
                       << origin_txt);
         }
-        // XXX: we need to hardcode the default, see above.
         ConstElementPtr filetype = zone_config->get("filetype");
         const string filetype_txt = filetype ? filetype->stringValue() :
             "text";