nits

- capitalize QNAME in the doc
- regenerate options/docbook
- whitespace

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 7f11110daf9ad09ad008689956913dedc1bc40bd..442c4ab61fd58b315852f0679b49719828f7d122 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -13,7 +13,7 @@
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
   <info>
-    <date>2018-01-22</date>
+    <date>2018-05-29</date>
   </info>
   <refentryinfo>
     <corpname>ISC</corpname>
@@ -205,7 +205,7 @@ options {
            <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] { ( <replaceable>masters</replaceable> | <replaceable>ipv4_address</replaceable> [
            port <replaceable>integer</replaceable> ] | <replaceable>ipv6_address</replaceable> [ port <replaceable>integer</replaceable> ] ) [ key
            <replaceable>string</replaceable> ]; ... } ] [ zone-directory <replaceable>quoted_string</replaceable> ] [
-           in-memory <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ]; ... };
+           in-memory <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <replaceable>boolean</replaceable>;
        check-mx ( fail | warn | ignore );
@@ -244,6 +244,7 @@ options {
        };
        dns64-contact <replaceable>string</replaceable>;
        dns64-server <replaceable>string</replaceable>;
+       dnskey-sig-validity <replaceable>integer</replaceable>;
        dnsrps-enable <replaceable>boolean</replaceable>;
        dnsrps-options { <replaceable>unspecified-text</replaceable> };
        dnssec-accept-expired <replaceable>boolean</replaceable>;
@@ -292,14 +293,13 @@ options {
        fstrm-set-output-notify-threshold <replaceable>integer</replaceable>;
        fstrm-set-output-queue-model ( mpsc | spsc );
        fstrm-set-output-queue-size <replaceable>integer</replaceable>;
-       fstrm-set-reopen-interval <replaceable>integer</replaceable>;
+       fstrm-set-reopen-interval <replaceable>ttlval</replaceable>;
        geoip-directory ( <replaceable>quoted_string</replaceable> | none );
-       geoip-use-ecs <replaceable>boolean</replaceable>;
        glue-cache <replaceable>boolean</replaceable>;
        heartbeat-interval <replaceable>integer</replaceable>;
        hostname ( <replaceable>quoted_string</replaceable> | none );
        inline-signing <replaceable>boolean</replaceable>;
-       interface-interval <replaceable>integer</replaceable>;
+       interface-interval <replaceable>ttlval</replaceable>;
        ixfr-from-differences ( primary | master | secondary | slave |
            <replaceable>boolean</replaceable> );
        keep-response-order { <replaceable>address_match_element</replaceable>; ... };
@@ -318,10 +318,10 @@ options {
        masterfile-style ( full | relative );
        match-mapped-addresses <replaceable>boolean</replaceable>;
        max-cache-size ( default | unlimited | <replaceable>sizeval</replaceable> | <replaceable>percentage</replaceable> );
-       max-cache-ttl <replaceable>integer</replaceable>;
+       max-cache-ttl <replaceable>ttlval</replaceable>;
        max-clients-per-query <replaceable>integer</replaceable>;
        max-journal-size ( default | unlimited | <replaceable>sizeval</replaceable> );
-       max-ncache-ttl <replaceable>integer</replaceable>;
+       max-ncache-ttl <replaceable>ttlval</replaceable>;
        max-records <replaceable>integer</replaceable>;
        max-recursion-depth <replaceable>integer</replaceable>;
        max-recursion-queries <replaceable>integer</replaceable>;
@@ -362,6 +362,7 @@ options {
        preferred-glue <replaceable>string</replaceable>;
        prefetch <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ];
        provide-ixfr <replaceable>boolean</replaceable>;
+       qname-minimization ( strict | relaxed | disabled );
        query-source ( ( [ address ] ( <replaceable>ipv4_address</replaceable> | * ) [ port (
            <replaceable>integer</replaceable> | * ) ] ) | ( [ [ address ] ( <replaceable>ipv4_address</replaceable> | * ) ]
            port ( <replaceable>integer</replaceable> | * ) ) ) [ dscp <replaceable>integer</replaceable> ];
@@ -401,18 +402,19 @@ options {
        response-padding { <replaceable>address_match_element</replaceable>; ... } block-size
            <replaceable>integer</replaceable>;
        response-policy { zone <replaceable>quoted_string</replaceable> [ log <replaceable>boolean</replaceable> ] [
-           max-policy-ttl <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           max-policy-ttl <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            policy ( cname | disabled | drop | given | no-op | nodata |
            nxdomain | passthru | tcp-only <replaceable>quoted_string</replaceable> ) ] [
            recursive-only <replaceable>boolean</replaceable> ] [ nsip-enable <replaceable>boolean</replaceable> ] [
            nsdname-enable <replaceable>boolean</replaceable> ]; ... } [ break-dnssec <replaceable>boolean</replaceable> ] [
-           max-policy-ttl <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           max-policy-ttl <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            min-ns-dots <replaceable>integer</replaceable> ] [ nsip-wait-recurse <replaceable>boolean</replaceable> ] [
            qname-wait-recurse <replaceable>boolean</replaceable> ] [ recursive-only <replaceable>boolean</replaceable> ] [
            nsip-enable <replaceable>boolean</replaceable> ] [ nsdname-enable <replaceable>boolean</replaceable> ] [
            dnsrps-enable <replaceable>boolean</replaceable> ] [ dnsrps-options { <replaceable>unspecified-text</replaceable>
            } ];
        root-delegation-only [ exclude { <replaceable>quoted_string</replaceable>; ... } ];
+       root-key-sentinel <replaceable>boolean</replaceable>;
        rrset-order { [ class <replaceable>string</replaceable> ] [ type <replaceable>string</replaceable> ] [ name
            <replaceable>quoted_string</replaceable> ] <replaceable>string</replaceable> <replaceable>string</replaceable>; ... };
        secroots-file <replaceable>quoted_string</replaceable>;
@@ -557,7 +559,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
            <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] { ( <replaceable>masters</replaceable> | <replaceable>ipv4_address</replaceable> [
            port <replaceable>integer</replaceable> ] | <replaceable>ipv6_address</replaceable> [ port <replaceable>integer</replaceable> ] ) [ key
            <replaceable>string</replaceable> ]; ... } ] [ zone-directory <replaceable>quoted_string</replaceable> ] [
-           in-memory <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ]; ... };
+           in-memory <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <replaceable>boolean</replaceable>;
        check-mx ( fail | warn | ignore );
@@ -595,6 +597,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        };
        dns64-contact <replaceable>string</replaceable>;
        dns64-server <replaceable>string</replaceable>;
+       dnskey-sig-validity <replaceable>integer</replaceable>;
        dnsrps-enable <replaceable>boolean</replaceable>;
        dnsrps-options { <replaceable>unspecified-text</replaceable> };
        dnssec-accept-expired <replaceable>boolean</replaceable>;
@@ -648,10 +651,10 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        match-destinations { <replaceable>address_match_element</replaceable>; ... };
        match-recursive-only <replaceable>boolean</replaceable>;
        max-cache-size ( default | unlimited | <replaceable>sizeval</replaceable> | <replaceable>percentage</replaceable> );
-       max-cache-ttl <replaceable>integer</replaceable>;
+       max-cache-ttl <replaceable>ttlval</replaceable>;
        max-clients-per-query <replaceable>integer</replaceable>;
        max-journal-size ( default | unlimited | <replaceable>sizeval</replaceable> );
-       max-ncache-ttl <replaceable>integer</replaceable>;
+       max-ncache-ttl <replaceable>ttlval</replaceable>;
        max-records <replaceable>integer</replaceable>;
        max-recursion-depth <replaceable>integer</replaceable>;
        max-recursion-queries <replaceable>integer</replaceable>;
@@ -686,6 +689,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        preferred-glue <replaceable>string</replaceable>;
        prefetch <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ];
        provide-ixfr <replaceable>boolean</replaceable>;
+       qname-minimization ( strict | relaxed | disabled );
        query-source ( ( [ address ] ( <replaceable>ipv4_address</replaceable> | * ) [ port (
            <replaceable>integer</replaceable> | * ) ] ) | ( [ [ address ] ( <replaceable>ipv4_address</replaceable> | * ) ]
            port ( <replaceable>integer</replaceable> | * ) ) ) [ dscp <replaceable>integer</replaceable> ];
@@ -720,18 +724,19 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        response-padding { <replaceable>address_match_element</replaceable>; ... } block-size
            <replaceable>integer</replaceable>;
        response-policy { zone <replaceable>quoted_string</replaceable> [ log <replaceable>boolean</replaceable> ] [
-           max-policy-ttl <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           max-policy-ttl <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            policy ( cname | disabled | drop | given | no-op | nodata |
            nxdomain | passthru | tcp-only <replaceable>quoted_string</replaceable> ) ] [
            recursive-only <replaceable>boolean</replaceable> ] [ nsip-enable <replaceable>boolean</replaceable> ] [
            nsdname-enable <replaceable>boolean</replaceable> ]; ... } [ break-dnssec <replaceable>boolean</replaceable> ] [
-           max-policy-ttl <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           max-policy-ttl <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            min-ns-dots <replaceable>integer</replaceable> ] [ nsip-wait-recurse <replaceable>boolean</replaceable> ] [
            qname-wait-recurse <replaceable>boolean</replaceable> ] [ recursive-only <replaceable>boolean</replaceable> ] [
            nsip-enable <replaceable>boolean</replaceable> ] [ nsdname-enable <replaceable>boolean</replaceable> ] [
            dnsrps-enable <replaceable>boolean</replaceable> ] [ dnsrps-options { <replaceable>unspecified-text</replaceable>
            } ];
        root-delegation-only [ exclude { <replaceable>quoted_string</replaceable>; ... } ];
+       root-key-sentinel <replaceable>boolean</replaceable>;
        rrset-order { [ class <replaceable>string</replaceable> ] [ type <replaceable>string</replaceable> ] [ name
            <replaceable>quoted_string</replaceable> ] <replaceable>string</replaceable> <replaceable>string</replaceable>; ... };
        send-cookie <replaceable>boolean</replaceable>;
@@ -824,6 +829,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
                dialup ( notify | notify-passive | passive | refresh |
                    <replaceable>boolean</replaceable> );
                dlz <replaceable>string</replaceable>;
+               dnskey-sig-validity <replaceable>integer</replaceable>;
                dnssec-dnskey-kskonly <replaceable>boolean</replaceable>;
                dnssec-loadkeys-interval <replaceable>integer</replaceable>;
                dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
@@ -930,6 +936,7 @@ zone <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        delegation-only <replaceable>boolean</replaceable>;
        dialup ( notify | notify-passive | passive | refresh | <replaceable>boolean</replaceable> );
        dlz <replaceable>string</replaceable>;
+       dnskey-sig-validity <replaceable>integer</replaceable>;
        dnssec-dnskey-kskonly <replaceable>boolean</replaceable>;
        dnssec-loadkeys-interval <replaceable>integer</replaceable>;
        dnssec-secure-to-insecure <replaceable>boolean</replaceable>;

diff --git a/bin/named/server.c b/bin/named/server.c
index bfdc2af9b7666727598450ea70195696eb3d7526..ab14623afaa437b6bb735c6dc00b1d5c2812ece1 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3690,7 +3690,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
        isc_dscp_t dscp4 = -1, dscp6 = -1;
        dns_dyndbctx_t *dctx = NULL;
        unsigned int resolver_param;
-       const char * qminmode = NULL;
+       const char *qminmode = NULL;
 
        REQUIRE(DNS_VIEW_VALID(view));
 

diff --git a/doc/arm/master.zoneopt.xml b/doc/arm/master.zoneopt.xml
index f68ace8b982bb2a8d3be505f9941604da11f46be..e1261b4e9a18f4160d2ddfb9990d35bee3997e03 100644 (file)
--- a/doc/arm/master.zoneopt.xml
+++ b/doc/arm/master.zoneopt.xml
@@ -33,6 +33,7 @@
        <command>database</command> <replaceable>string</replaceable>;
        <command>dialup</command> ( notify | notify-passive | passive | refresh | <replaceable>boolean</replaceable> );
        <command>dlz</command> <replaceable>string</replaceable>;
+       <command>dnskey-sig-validity</command> <replaceable>integer</replaceable>;
        <command>dnssec-dnskey-kskonly</command> <replaceable>boolean</replaceable>;
        <command>dnssec-loadkeys-interval</command> <replaceable>integer</replaceable>;
        <command>dnssec-secure-to-insecure</command> <replaceable>boolean</replaceable>;

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index f2d8ab30572022e74d68f0fe00119eb5bf794922..abc681dd28eb3415b38d6bd9bbfd08b7aeb96d3d 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -101,11 +101,11 @@
       </listitem>
       <listitem>
        <para>
-         Support for qname minimization was added and enabled by default in
-         <command>relaxed</command> mode - in which BIND will fall back to
-         normal resolution should the remote server return something
-         unexpected during query minimization process. This default setting
-         might change to <command>strict</command> in the future.
+         Support for QNAME minimization was added and enabled by default
+         in <command>relaxed</command> mode, in which BIND will fall back
+         to normal resolution if the remote server returns something
+         unexpected during the query minimization process. This default
+         setting might change to <command>strict</command> in the future.
        </para>
       </listitem>
     </itemizedlist>

diff --git a/doc/arm/options.grammar.xml b/doc/arm/options.grammar.xml
index 09dbab854c9bd2c382497d1833b317487999f57e..4624fbfa9da1689ad5c541d09c94bfd5e0fbbd27 100644 (file)
--- a/doc/arm/options.grammar.xml
+++ b/doc/arm/options.grammar.xml
@@ -44,7 +44,7 @@
            <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] { ( <replaceable>masters</replaceable> | <replaceable>ipv4_address</replaceable> [
            <command>port</command> <replaceable>integer</replaceable> ] | <replaceable>ipv6_address</replaceable> [ port <replaceable>integer</replaceable> ] ) [ key
            <replaceable>string</replaceable> ]; ... } ] [ zone-directory <replaceable>quoted_string</replaceable> ] [
-           <command>in-memory</command> <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ]; ... };
+           <command>in-memory</command> <replaceable>boolean</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ]; ... };
        <command>check-dup-records</command> ( fail | warn | ignore );
        <command>check-integrity</command> <replaceable>boolean</replaceable>;
        <command>check-mx</command> ( fail | warn | ignore );
@@ -83,6 +83,7 @@
        };
        <command>dns64-contact</command> <replaceable>string</replaceable>;
        <command>dns64-server</command> <replaceable>string</replaceable>;
+       <command>dnskey-sig-validity</command> <replaceable>integer</replaceable>;
        <command>dnsrps-enable</command> <replaceable>boolean</replaceable>;
        <command>dnsrps-options</command> { <replaceable>unspecified-text</replaceable> };
        <command>dnssec-accept-expired</command> <replaceable>boolean</replaceable>;
@@ -131,14 +132,13 @@
        <command>fstrm-set-output-notify-threshold</command> <replaceable>integer</replaceable>;
        <command>fstrm-set-output-queue-model</command> ( mpsc | spsc );
        <command>fstrm-set-output-queue-size</command> <replaceable>integer</replaceable>;
-       <command>fstrm-set-reopen-interval</command> <replaceable>integer</replaceable>;
+       <command>fstrm-set-reopen-interval</command> <replaceable>ttlval</replaceable>;
        <command>geoip-directory</command> ( <replaceable>quoted_string</replaceable> | none );
-       <command>geoip-use-ecs</command> <replaceable>boolean</replaceable>;
        <command>glue-cache</command> <replaceable>boolean</replaceable>;
        <command>heartbeat-interval</command> <replaceable>integer</replaceable>;
        <command>hostname</command> ( <replaceable>quoted_string</replaceable> | none );
        <command>inline-signing</command> <replaceable>boolean</replaceable>;
-       <command>interface-interval</command> <replaceable>integer</replaceable>;
+       <command>interface-interval</command> <replaceable>ttlval</replaceable>;
        <command>ixfr-from-differences</command> ( primary | master | secondary | slave |
            <replaceable>boolean</replaceable> );
        <command>keep-response-order</command> { <replaceable>address_match_element</replaceable>; ... };
@@ -157,10 +157,10 @@
        <command>masterfile-style</command> ( full | relative );
        <command>match-mapped-addresses</command> <replaceable>boolean</replaceable>;
        <command>max-cache-size</command> ( default | unlimited | <replaceable>sizeval</replaceable> | <replaceable>percentage</replaceable> );
-       <command>max-cache-ttl</command> <replaceable>integer</replaceable>;
+       <command>max-cache-ttl</command> <replaceable>ttlval</replaceable>;
        <command>max-clients-per-query</command> <replaceable>integer</replaceable>;
        <command>max-journal-size</command> ( default | unlimited | <replaceable>sizeval</replaceable> );
-       <command>max-ncache-ttl</command> <replaceable>integer</replaceable>;
+       <command>max-ncache-ttl</command> <replaceable>ttlval</replaceable>;
        <command>max-records</command> <replaceable>integer</replaceable>;
        <command>max-recursion-depth</command> <replaceable>integer</replaceable>;
        <command>max-recursion-queries</command> <replaceable>integer</replaceable>;
@@ -201,6 +201,7 @@
        <command>preferred-glue</command> <replaceable>string</replaceable>;
        <command>prefetch</command> <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ];
        <command>provide-ixfr</command> <replaceable>boolean</replaceable>;
+       <command>qname-minimization</command> ( strict | relaxed | disabled );
        <command>query-source</command> ( ( [ address ] ( <replaceable>ipv4_address</replaceable> | * ) [ port (
            <replaceable>integer</replaceable> | * ) ] ) | ( [ [ address ] ( <replaceable>ipv4_address</replaceable> | * ) ]
            <command>port</command> ( <replaceable>integer</replaceable> | * ) ) ) [ dscp <replaceable>integer</replaceable> ];
@@ -240,18 +241,19 @@
        <command>response-padding</command> { <replaceable>address_match_element</replaceable>; ... } block-size
            <replaceable>integer</replaceable>;
        <command>response-policy</command> { zone <replaceable>quoted_string</replaceable> [ log <replaceable>boolean</replaceable> ] [
-           <command>max-policy-ttl</command> <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           <command>max-policy-ttl</command> <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            <command>policy</command> ( cname | disabled | drop | given | no-op | nodata |
            <command>nxdomain</command> | passthru | tcp-only <replaceable>quoted_string</replaceable> ) ] [
            <command>recursive-only</command> <replaceable>boolean</replaceable> ] [ nsip-enable <replaceable>boolean</replaceable> ] [
            <command>nsdname-enable</command> <replaceable>boolean</replaceable> ]; ... } [ break-dnssec <replaceable>boolean</replaceable> ] [
-           <command>max-policy-ttl</command> <replaceable>integer</replaceable> ] [ min-update-interval <replaceable>integer</replaceable> ] [
+           <command>max-policy-ttl</command> <replaceable>ttlval</replaceable> ] [ min-update-interval <replaceable>ttlval</replaceable> ] [
            <command>min-ns-dots</command> <replaceable>integer</replaceable> ] [ nsip-wait-recurse <replaceable>boolean</replaceable> ] [
            <command>qname-wait-recurse</command> <replaceable>boolean</replaceable> ] [ recursive-only <replaceable>boolean</replaceable> ] [
            <command>nsip-enable</command> <replaceable>boolean</replaceable> ] [ nsdname-enable <replaceable>boolean</replaceable> ] [
            <command>dnsrps-enable</command> <replaceable>boolean</replaceable> ] [ dnsrps-options { <replaceable>unspecified-text</replaceable>
            } ];
        <command>root-delegation-only</command> [ exclude { <replaceable>quoted_string</replaceable>; ... } ];
+       <command>root-key-sentinel</command> <replaceable>boolean</replaceable>;
        <command>rrset-order</command> { [ class <replaceable>string</replaceable> ] [ type <replaceable>string</replaceable> ] [ name
            <replaceable>quoted_string</replaceable> ] <replaceable>string</replaceable> <replaceable>string</replaceable>; ... };
        <command>secroots-file</command> <replaceable>quoted_string</replaceable>;

diff --git a/doc/arm/slave.zoneopt.xml b/doc/arm/slave.zoneopt.xml
index 32e494a317eb4059c8b1a988ae8096b9884c280f..63c0a4acf182ffc6ac7e41a386284085d0d7cbf4 100644 (file)
--- a/doc/arm/slave.zoneopt.xml
+++ b/doc/arm/slave.zoneopt.xml
@@ -26,6 +26,7 @@
        <command>database</command> <replaceable>string</replaceable>;
        <command>dialup</command> ( notify | notify-passive | passive | refresh | <replaceable>boolean</replaceable> );
        <command>dlz</command> <replaceable>string</replaceable>;
+       <command>dnskey-sig-validity</command> <replaceable>integer</replaceable>;
        <command>dnssec-dnskey-kskonly</command> <replaceable>boolean</replaceable>;
        <command>dnssec-loadkeys-interval</command> <replaceable>integer</replaceable>;
        <command>dnssec-update-mode</command> ( maintain | no-resign );

diff --git a/doc/misc/options b/doc/misc/options
index 60ddaea3b2ab171fa702cc7a239c07387e2fc49d..f1e3d1023fe9598270874ba208957f5f57be6fe0 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -185,7 +185,7 @@ options {
         fstrm-set-output-queue-size <integer>; // not configured
         fstrm-set-reopen-interval <ttlval>; // not configured
         geoip-directory ( <quoted_string> | none ); // not configured
-        geoip-use-ecs <boolean>; // not configured
+        geoip-use-ecs <boolean>; // obsolete
         glue-cache <boolean>;
         has-old-clients <boolean>; // obsolete
         heartbeat-interval <integer>;
@@ -205,7 +205,7 @@ options {
         listen-on-v6 [ port <integer> ] [ dscp
             <integer> ] {
             <address_match_element>; ... }; // may occur multiple times
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         lock-file ( <quoted_string> | none );
         maintain-ixfr-base <boolean>; // obsolete
         managed-keys-directory <quoted_string>;
@@ -264,7 +264,7 @@ options {
         preferred-glue <string>;
         prefetch <integer> [ <integer> ];
         provide-ixfr <boolean>;
-       qname-minimization ( strict | relaxed | disabled );
+        qname-minimization ( strict | relaxed | disabled );
         query-source ( ( [ address ] ( <ipv4_address> | * ) [ port (
             <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ]
             port ( <integer> | * ) ) ) [ dscp <integer> ];
@@ -544,7 +544,7 @@ view <string> [ <class> ] {
         }; // may occur multiple times
         key-directory <quoted_string>;
         lame-ttl <ttlval>;
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         maintain-ixfr-base <boolean>; // obsolete
         managed-keys { <string> <string>
             <integer> <integer> <integer>
@@ -598,6 +598,7 @@ view <string> [ <class> ] {
         preferred-glue <string>;
         prefetch <integer> [ <integer> ];
         provide-ixfr <boolean>;
+        qname-minimization ( strict | relaxed | disabled );
         query-source ( ( [ address ] ( <ipv4_address> | * ) [ port (
             <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ]
             port ( <integer> | * ) ) ) [ dscp <integer> ];

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e1f70148b8e4fb214f791164a4373304cec66198..55fd1eeccca773df22dc9fdefd252426553febfc 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9406,7 +9406,7 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) {
                              DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
                              "disabling qname minimization for '%s'"
                              " due to bad server", fctx->info);
-               fctx->qmin_labels = DNS_MAX_LABELS + 1;
+               fctx->qmin_labels = DNS_MAX_LABELS + 1;
                result = rctx_answer_minimized(rctx);
        } else if (!NOCOOKIE(query->addrinfo) &&
            (fctx->rmessage->rcode == dns_rcode_formerr ||