2903. [bug] managed-keys-directory missing from namedconf.c.

                        [RT #21370]

diff --git a/CHANGES b/CHANGES
index 1c4e87b0ca4adc42c4fe39727f6d4826faf7626a..c4af457090861aced789a73a206ace7c47646484 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2903.  [bug]           managed-keys-directory missing from namedconf.c.
+                       [RT #21370]
+
 2902.  [func]          Add regression test for change 2897. [RT #21040]
 
 2901.  [port]          Use AC_C_FLEXIBLE_ARRAY_MEMBER. [RT #21316]

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index e16a8a1020df377c2f59da2e459989fc57ed54e8..e14435ffcbdf647d9138717424a3d46519f0c67b 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.115 2010/05/13 23:50:27 tbox Exp $ */
+/* $Id: namedconf.c,v 1.116 2010/05/21 14:10:32 marka Exp $ */
 
 /*! \file */
 
@@ -847,6 +847,7 @@ options_clauses[] = {
        { "interface-interval", &cfg_type_uint32, 0 },
        { "listen-on", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
        { "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
+       { "managed-keys-directory", &cfg_type_qstring, 0 },
        { "match-mapped-addresses", &cfg_type_boolean, 0 },
        { "memstatistics-file", &cfg_type_qstring, 0 },
        { "memstatistics", &cfg_type_boolean, 0 },