author | Ben Chang <Benjamin.Chang@Oracle.COM> |
Mon, 23 Jan 2017 11:25:04 -0800 | |
branch | s11u3-sru |
changeset 7592 | 12dea84f307b |
permissions | -rw-r--r-- |
7592
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch was derived from a source code patch provided by ISC to |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
2 |
resolve ISC ticket RT #43779. [9.6-ESV-R11-S10] |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
3 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
4 |
--- old/./CHANGES Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ new/./CHANGES Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -1,5 +1,9 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
7 |
--- 9.6-ESV-R11-S10 released --- |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
8 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
9 |
+4530. [bug] Change 4489 broke the handling of CNAME -> DNAME |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
10 |
+ in responses resulting in SERVFAIL being returned. |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
11 |
+ [RT #43779] |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
12 |
+ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
13 |
4517. [security] Named could mishandle authority sections that were |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
14 |
missing RRSIGs triggering an assertion failure. |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
15 |
(CVE-2016-9444) [RT #43632] |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
16 |
--- old/bin/tests/system/dname/ns2/example.db Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ new/bin/tests/system/dname/ns2/example.db Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -29,4 +29,6 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
19 |
short-dname DNAME short |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
20 |
a.longlonglonglonglonglonglonglonglonglonglonglonglong A 10.0.0.2 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
21 |
long-dname DNAME longlonglonglonglonglonglonglonglonglonglonglonglong |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
22 |
-; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
23 |
+cname CNAME a.cnamedname |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
24 |
+cnamedname DNAME target |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
25 |
+a.target A 10.0.0.3 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
26 |
--- old/bin/tests/system/dname/tests.sh Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
27 |
+++ new/bin/tests/system/dname/tests.sh Thu Jan 12 00:28:22 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
28 |
@@ -63,6 +63,24 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
29 |
if [ $ret != 0 ]; then echo "I:failed"; fi |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
30 |
status=`expr $status + $ret` |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
31 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
32 |
+echo "I:checking cname to dname from authoritative" |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
33 |
+ret=0 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
34 |
+$DIG cname.example @10.53.0.2 a -p 5300 > dig.out.ns2.cname |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
35 |
+grep "status: NOERROR" dig.out.ns2.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
36 |
+if [ $ret != 0 ]; then echo "I:failed"; fi |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
37 |
+status=`expr $status + $ret` |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
38 |
+ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
39 |
+echo "I:checking cname to dname from recursive" |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
40 |
+ret=0 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
41 |
+$DIG cname.example @10.53.0.4 a -p 5300 > dig.out.ns4.cname |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
42 |
+grep "status: NOERROR" dig.out.ns4.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
43 |
+grep '^cname.example.' dig.out.ns4.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
44 |
+grep '^cnamedname.example.' dig.out.ns4.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
45 |
+grep '^a.cnamedname.example.' dig.out.ns4.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
46 |
+grep '^a.target.example.' dig.out.ns4.cname > /dev/null || ret=1 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
47 |
+if [ $ret != 0 ]; then echo "I:failed"; fi |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
48 |
+status=`expr $status + $ret` |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
49 |
+ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
50 |
echo "I:exit status: $status" |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
51 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
52 |
exit $status |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
53 |
--- old/lib/dns/resolver.c Thu Jan 12 00:28:23 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
54 |
+++ new/lib/dns/resolver.c Thu Jan 12 00:28:23 2017 |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
55 |
@@ -5776,7 +5776,7 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
56 |
answer_response(fetchctx_t *fctx) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
57 |
isc_result_t result; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
58 |
dns_message_t *message; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
59 |
- dns_name_t *name, *dname = NULL, *qname, *dqname, tname, *ns_name; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
60 |
+ dns_name_t *name, *dname = NULL, *qname, tname, *ns_name; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
61 |
dns_name_t *cname = NULL; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
62 |
dns_rdataset_t *rdataset, *ns_rdataset; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
63 |
isc_boolean_t done, external, chaining, aa, found, want_chaining; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
64 |
@@ -5784,7 +5784,7 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
65 |
isc_boolean_t wanted_chaining; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
66 |
unsigned int aflag; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
67 |
dns_rdatatype_t type; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
68 |
- dns_fixedname_t fdname, fqname, fqdname; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
69 |
+ dns_fixedname_t fdname, fqname; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
70 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
71 |
FCTXTRACE("answer_response"); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
72 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
73 |
@@ -5807,12 +5807,11 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
74 |
aa = ISC_TRUE; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
75 |
else |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
76 |
aa = ISC_FALSE; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
77 |
- dqname = qname = &fctx->name; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
78 |
+ qname = &fctx->name; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
79 |
type = fctx->type; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
80 |
- dns_fixedname_init(&fqdname); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
81 |
result = dns_message_firstname(message, DNS_SECTION_ANSWER); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
82 |
while (!done && result == ISC_R_SUCCESS) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
83 |
- dns_namereln_t namereln, dnamereln; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
84 |
+ dns_namereln_t namereln; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
85 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
86 |
int order; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
87 |
unsigned int nlabels; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
88 |
@@ -5821,8 +5820,6 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
89 |
dns_message_currentname(message, DNS_SECTION_ANSWER, &name); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
90 |
external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain)); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
91 |
namereln = dns_name_fullcompare(qname, name, &order, &nlabels); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
92 |
- dnamereln = dns_name_fullcompare(dqname, name, &order, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
93 |
- &nlabels); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
94 |
if (namereln == dns_namereln_equal) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
95 |
wanted_chaining = ISC_FALSE; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
96 |
for (rdataset = ISC_LIST_HEAD(name->list); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
97 |
@@ -6074,11 +6071,24 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
98 |
return (DNS_R_FORMERR); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
99 |
} |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
100 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
101 |
- if (dnamereln != dns_namereln_subdomain) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
102 |
+ /* |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
103 |
+ * If DNAME + synthetic CNAME then the |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
104 |
+ * namereln is dns_namereln_subdomain. |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
105 |
+ * |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
106 |
+ * If synthetic CNAME + DNAME then the |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
107 |
+ * namereln is dns_namereln_commonancestor |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
108 |
+ * and the number of label must match the |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
109 |
+ * DNAME. This order is not RFC compliant. |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
110 |
+ */ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
111 |
+ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
112 |
+ if (namereln != dns_namereln_subdomain && |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
113 |
+ (namereln != dns_namereln_commonancestor || |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
114 |
+ nlabels != dns_name_countlabels(name))) |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
115 |
+ { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
116 |
char qbuf[DNS_NAME_FORMATSIZE]; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
117 |
char obuf[DNS_NAME_FORMATSIZE]; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
118 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
119 |
- dns_name_format(dqname, qbuf, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
120 |
+ dns_name_format(qname, qbuf, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
121 |
sizeof(qbuf)); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
122 |
dns_name_format(name, obuf, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
123 |
sizeof(obuf)); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
124 |
@@ -6097,7 +6107,7 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
125 |
want_chaining = ISC_TRUE; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
126 |
POST(want_chaining); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
127 |
aflag = DNS_RDATASETATTR_ANSWER; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
128 |
- result = dname_target(rdataset, dqname, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
129 |
+ result = dname_target(rdataset, qname, |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
130 |
nlabels, &fdname); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
131 |
if (result == ISC_R_NOSPACE) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
132 |
/* |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
133 |
@@ -6113,8 +6123,6 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
134 |
dnameset = rdataset; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
135 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
136 |
dname = dns_fixedname_name(&fdname); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
137 |
- dqname = dns_fixedname_name(&fqdname); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
138 |
- dns_name_copy(dname, dqname, NULL); |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
139 |
} else { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
140 |
/* |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
141 |
* We've found a signature that |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
142 |
@@ -6261,7 +6269,8 @@ |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
143 |
rdataset->trust = |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
144 |
dns_trust_additional; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
145 |
|
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
146 |
- if (rdataset->type == dns_rdatatype_ns) { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
147 |
+ if (rdataset->type == dns_rdatatype_ns) |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
148 |
+ { |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
149 |
ns_name = name; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
150 |
ns_rdataset = rdataset; |
12dea84f307b
25371178 Upgrade Solaris to BIND 9.6-ESV-R11-S10
Ben Chang <Benjamin.Chang@Oracle.COM>
parents:
diff
changeset
|
151 |
} |