add missing fixes

diff --git a/bin/named/query.c b/bin/named/query.c
index 0365723c2999b6510e1ad894e2b413b6f47f556c..60bcdc585f1ffc9a18dc6f884093900409436ef0 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.298.48.15.2.2 2009/12/31 21:02:44 each Exp $ */
+/* $Id: query.c,v 1.298.48.15.2.3 2009/12/31 21:45:53 each Exp $ */
 
 /*! \file */
 
@@ -1143,7 +1143,8 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
                        goto cleanup;
        }
        result = dns_db_find(db, name, version, type,
-                            client->query.dboptions | DNS_DBFIND_GLUEOK,
+                            client->query.dboptions |
+                            DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
                             client->now, &node, fname, rdataset,
                             sigrdataset);
        if (result == DNS_R_GLUE &&
@@ -1189,7 +1190,8 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 
        dns_db_attach(client->query.gluedb, &db);
        result = dns_db_find(db, name, version, type,
-                            client->query.dboptions | DNS_DBFIND_GLUEOK,
+                            client->query.dboptions |
+                            DNS_DBFIND_GLUEOK | DNS_DBFIND_ADDITIONALOK,
                             client->now, &node, fname, rdataset,
                             sigrdataset);
        if (!(result == ISC_R_SUCCESS ||

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index fe8d1c36be2ed4804862fac937ea01a440e64230..30eb0c764bf056ad5e53f0ccfa6131c920f629f7 100644 (file)
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.23 2007/06/19 23:47:02 tbox Exp $
+# $Id: sign.sh,v 1.23.288.1 2009/12/31 21:45:53 each Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
@@ -35,7 +35,6 @@ keyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone`
 
 cat $infile $keyname.key > $zonefile
 
-echo $SIGNER -g -r $RANDFILE -o $zone $zonefile
 $SIGNER -g -r $RANDFILE -o $zone $zonefile > /dev/null
 
 # Configure the resolving server with a trusted key.

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 32fa836b5ff3aa1f0ce6971b33a9a60156c8235c..72322bb25d7b5f0bb6c2a5c089d2417ddccb0954 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.89.128.5 2009/01/19 00:01:11 marka Exp $ */
+/* $Id: db.h,v 1.89.128.5.2.1 2009/12/31 21:45:53 each Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -187,13 +187,14 @@ struct dns_db {
 /*%
  * Options that can be specified for dns_db_find().
  */
-#define DNS_DBFIND_GLUEOK              0x01
-#define DNS_DBFIND_VALIDATEGLUE                0x02
-#define DNS_DBFIND_NOWILD              0x04
-#define DNS_DBFIND_PENDINGOK           0x08
-#define DNS_DBFIND_NOEXACT             0x10
-#define DNS_DBFIND_FORCENSEC           0x20
-#define DNS_DBFIND_COVERINGNSEC                0x40
+#define DNS_DBFIND_GLUEOK              0x0001
+#define DNS_DBFIND_VALIDATEGLUE                0x0002
+#define DNS_DBFIND_NOWILD              0x0004
+#define DNS_DBFIND_PENDINGOK           0x0008
+#define DNS_DBFIND_NOEXACT             0x0010
+#define DNS_DBFIND_FORCENSEC           0x0020
+#define DNS_DBFIND_COVERINGNSEC                0x0040
+#define DNS_DBFIND_ADDITIONALOK                0x0100
 /*@}*/
 
 /*@{*/

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 293288636c90fa590b37e781a6ad1a5ce7649086..91ced3ec81786a8d520599412d70a6b2c71fd039 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.248.12.18.2.1 2009/11/18 23:41:18 marka Exp $ */
+/* $Id: rbtdb.c,v 1.248.12.18.2.2 2009/12/31 21:45:53 each Exp $ */
 
 /*! \file */
 
@@ -4106,6 +4106,8 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
         * If we didn't find what we were looking for...
         */
        if (found == NULL ||
+           (DNS_TRUST_ADDITIONAL(found->trust) &&
+            ((options & DNS_DBFIND_ADDITIONALOK) == 0)) ||
            (found->trust == dns_trust_glue &&
             ((options & DNS_DBFIND_GLUEOK) == 0)) ||
            (DNS_TRUST_PENDING(found->trust) &&