Un-deprecate the answer-cookie option

diff --git a/CHANGES b/CHANGES
index b5891ce1197ae32ffaaa533299daa24c452dbf3f..0d6894e00f7cb4243e6d674fa8ad977e6abee7f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4983.  [cleanup]       Remove the deprecated flag from "answer-cookie";
+                        it will be allowed to persist into 9.13. [GL #275].
+
 4982.  [cleanup]       Return FORMERR if the question section is empty
                        and no COOKIE option is present; this restores
                        older behavior except in the newly specified

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index e47420238b5edfa93f04efdf266c533511a6b2b1..b4f9ba660ba12b8624e752d0f9158cac4b77c2bf 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6099,19 +6099,16 @@ options {
                  options level, not per-view.
                </para>
                <para>
-                 <command>answer-cookie</command> is only available
-                 as a temporary measure, for use when
-                 <command>named</command> shares an IP address
-                 with other servers that do not yet support DNS
-                 COOKIE.  A mismatch between servers on the same
-                 address is not expected to cause operational
-                 problems, but the option to disable COOKIE responses
-                 so that all servers have the same behavior is
-                 provided out of an abundance of caution. DNS COOKIE
-                 is an important security mechanism and should not be
-                 disabled unless absolutely necessary.  The
-                 <command>answer-cookie</command> option is obsolete
-                 as of BIND 9.13.
+                 <command>answer-cookie no</command> is only intended as a
+                 temporary measure, for use when <command>named</command>
+                 shares an IP address with other servers that do not yet
+                 support DNS COOKIE.  A mismatch between servers on the
+                 same address is not expected to cause operational
+                 problems, but the option to disable COOKIE responses so
+                 that all servers have the same behavior is provided out
+                 of an abundance of caution. DNS COOKIE is an important
+                 security mechanism, and should not be disabled unless
+                 absolutely necessary.
                </para>
              </listitem>
            </varlistentry>

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index fb6ec90e2786ccb96fce30f68f2d5ae791dd6525..de0c6c3cf470a2f053cd6195ca21d4c55225a896 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -96,10 +96,11 @@
        <para>
          Add the ability to not return a DNS COOKIE option when one
          is present in the request.  To prevent a cookie being returned
-         add 'answer-cookie no;' to named.conf. [GL #173]
+         add <command>answer-cookie no;</command> to
+         <filename>named.conf</filename>. [GL #173]
        </para>
        <para>
-         <command>answer-cookie</command> is only available as a
+         <command>answer-cookie no</command> is only intended as a
          temporary measure, for use when <command>named</command>
          shares an IP address with other servers that do not yet
          support DNS COOKIE.  A mismatch between servers on the
@@ -107,9 +108,8 @@
          but the option to disable COOKIE responses so that all
          servers have the same behavior is provided out of an
          abundance of caution. DNS COOKIE is an important security
-         mechanism and should not be disabled unless absolutely
-         necessary.  The <command>answer-cookie</command> option
-         is obsolete as of BIND 9.13.
+         mechanism, and should not be disabled unless absolutely
+         necessary.
        </para>
       </listitem>
     </itemizedlist>

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 8698afea3ae8124c6c53ec2dccdf6c896d8cd085..c14a19a7b14ad68d6192ac0fbc6c38c55618a87a 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1027,7 +1027,7 @@ static cfg_type_t cfg_type_fstrm_model = {
  */
 static cfg_clausedef_t
 options_clauses[] = {
-       { "answer-cookie", &cfg_type_boolean, CFG_CLAUSEFLAG_DEPRECATED },
+       { "answer-cookie", &cfg_type_boolean, 0 },
        { "automatic-interface-scan", &cfg_type_boolean, 0 },
        { "avoid-v4-udp-ports", &cfg_type_bracketed_portlist, 0 },
        { "avoid-v6-udp-ports", &cfg_type_bracketed_portlist, 0 },