author | pkidd <patrick.kidd@oracle.com> |
Thu, 17 Nov 2016 08:54:23 -0800 | |
branch | s11u3-sru |
changeset 7340 | 16972dd9074c |
parent 7289 | 5dcdb05e829c |
permissions | -rw-r--r-- |
7289
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
1 |
This patch was derived from a source code patch provided by ISC to |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
2 |
resolve ISC ticket RT #43465. [9.6-ESV-R11-S9] |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
3 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
4 |
diff -r 94ec7bb11985 CHANGES |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
5 |
--- a/CHANGES Thu Oct 27 01:35:34 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/CHANGES Fri Oct 28 17:37:53 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
7 |
@@ -1,3 +1,8 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
8 |
+ --- 9.6-ESV-R11-S9 released --- |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
9 |
+ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
10 |
+4489. [security] It was possible to trigger assertions when processing |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
11 |
+ a response. (CVE-2016-8864) [RT #43465] |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
12 |
+ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
13 |
--- 9.6-ESV-R11-S8 released --- |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
14 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
15 |
4467. [security] It was possible to trigger a assertion when rendering |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
16 |
diff -r 94ec7bb11985 lib/dns/api |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
17 |
--- a/lib/dns/api Thu Oct 27 01:35:34 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
18 |
+++ b/lib/dns/api Fri Oct 28 17:37:53 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
19 |
@@ -5,5 +5,5 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
20 |
# 9.9: 90-109 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
21 |
# 9.9-sub: 130-139 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
22 |
LIBINTERFACE = 114 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
23 |
-LIBREVISION = 3 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
24 |
+LIBREVISION = 4 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
25 |
LIBAGE = 1 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
26 |
diff -r 94ec7bb11985 lib/dns/resolver.c |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
27 |
--- a/lib/dns/resolver.c Thu Oct 27 01:35:34 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
28 |
+++ b/lib/dns/resolver.c Fri Oct 28 17:37:53 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
29 |
@@ -503,7 +503,9 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
30 |
valarg->addrinfo = addrinfo; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
31 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
32 |
if (!ISC_LIST_EMPTY(fctx->validators)) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
33 |
- INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
34 |
+ valoptions |= DNS_VALIDATOR_DEFER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
35 |
+ else |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
36 |
+ valoptions &= ~DNS_VALIDATOR_DEFER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
37 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
38 |
result = dns_validator_create(fctx->res->view, name, type, rdataset, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
39 |
sigrdataset, fctx->rmessage, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
40 |
@@ -4849,13 +4851,6 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
41 |
rdataset, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
42 |
sigrdataset, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
43 |
valoptions, task); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
44 |
- /* |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
45 |
- * Defer any further validations. |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
46 |
- * This prevents multiple validators |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
47 |
- * from manipulating fctx->rmessage |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
48 |
- * simultaneously. |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
49 |
- */ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
50 |
- valoptions |= DNS_VALIDATOR_DEFER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
51 |
} |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
52 |
} else if (CHAINING(rdataset)) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
53 |
if (rdataset->type == dns_rdatatype_cname) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
54 |
@@ -4961,6 +4956,11 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
55 |
eresult == DNS_R_NCACHENXRRSET); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
56 |
} |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
57 |
event->result = eresult; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
58 |
+ if (adbp != NULL && *adbp != NULL) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
59 |
+ if (anodep != NULL && *anodep != NULL) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
60 |
+ dns_db_detachnode(*adbp, anodep); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
61 |
+ dns_db_detach(adbp); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
62 |
+ } |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
63 |
dns_db_attach(fctx->cache, adbp); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
64 |
dns_db_transfernode(fctx->cache, &node, anodep); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
65 |
clone_results(fctx); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
66 |
@@ -5208,6 +5208,11 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
67 |
fctx->attributes |= FCTX_ATTR_HAVEANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
68 |
if (event != NULL) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
69 |
event->result = eresult; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
70 |
+ if (adbp != NULL && *adbp != NULL) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
71 |
+ if (anodep != NULL && *anodep != NULL) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
72 |
+ dns_db_detachnode(*adbp, anodep); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
73 |
+ dns_db_detach(adbp); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
74 |
+ } |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
75 |
dns_db_attach(fctx->cache, adbp); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
76 |
dns_db_transfernode(fctx->cache, &node, anodep); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
77 |
clone_results(fctx); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
78 |
@@ -5777,13 +5782,15 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
79 |
answer_response(fetchctx_t *fctx) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
80 |
isc_result_t result; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
81 |
dns_message_t *message; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
82 |
- dns_name_t *name, *dname = NULL, *qname, tname, *ns_name; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
83 |
+ dns_name_t *name, *dname = NULL, *qname, *dqname, tname, *ns_name; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
84 |
+ dns_name_t *cname = NULL; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
85 |
dns_rdataset_t *rdataset, *ns_rdataset; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
86 |
isc_boolean_t done, external, chaining, aa, found, want_chaining; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
87 |
- isc_boolean_t have_answer, found_cname, found_type, wanted_chaining; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
88 |
+ isc_boolean_t have_answer, found_cname, found_dname, found_type; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
89 |
+ isc_boolean_t wanted_chaining; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
90 |
unsigned int aflag; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
91 |
dns_rdatatype_t type; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
92 |
- dns_fixedname_t fdname, fqname; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
93 |
+ dns_fixedname_t fdname, fqname, fqdname; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
94 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
95 |
FCTXTRACE("answer_response"); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
96 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
97 |
@@ -5796,6 +5803,7 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
98 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
99 |
done = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
100 |
found_cname = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
101 |
+ found_dname = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
102 |
found_type = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
103 |
chaining = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
104 |
have_answer = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
105 |
@@ -5805,11 +5813,13 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
106 |
aa = ISC_TRUE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
107 |
else |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
108 |
aa = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
109 |
- qname = &fctx->name; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
110 |
+ dqname = qname = &fctx->name; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
111 |
type = fctx->type; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
112 |
+ dns_fixedname_init(&fqdname); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
113 |
result = dns_message_firstname(message, DNS_SECTION_ANSWER); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
114 |
while (!done && result == ISC_R_SUCCESS) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
115 |
- dns_namereln_t namereln; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
116 |
+ dns_namereln_t namereln, dnamereln; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
117 |
+ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
118 |
int order; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
119 |
unsigned int nlabels; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
120 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
121 |
@@ -5817,6 +5827,8 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
122 |
dns_message_currentname(message, DNS_SECTION_ANSWER, &name); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
123 |
external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain)); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
124 |
namereln = dns_name_fullcompare(qname, name, &order, &nlabels); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
125 |
+ dnamereln = dns_name_fullcompare(dqname, name, &order, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
126 |
+ &nlabels); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
127 |
if (namereln == dns_namereln_equal) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
128 |
wanted_chaining = ISC_FALSE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
129 |
for (rdataset = ISC_LIST_HEAD(name->list); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
130 |
@@ -5897,7 +5909,7 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
131 |
return (result); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
132 |
} else if (rdataset->type == dns_rdatatype_rrsig |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
133 |
&& rdataset->covers == |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
134 |
- dns_rdatatype_cname |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
135 |
+ dns_rdatatype_cname |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
136 |
&& !found_type) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
137 |
/* |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
138 |
* We're looking for something else, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
139 |
@@ -5927,11 +5939,18 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
140 |
* a CNAME or DNAME). |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
141 |
*/ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
142 |
INSIST(!external); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
143 |
- if (aflag == |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
144 |
- DNS_RDATASETATTR_ANSWER) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
145 |
+ if ((rdataset->type != |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
146 |
+ dns_rdatatype_cname) || |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
147 |
+ !found_dname || |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
148 |
+ (aflag == |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
149 |
+ DNS_RDATASETATTR_ANSWER)) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
150 |
+ { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
151 |
have_answer = ISC_TRUE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
152 |
+ if (rdataset->type == |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
153 |
+ dns_rdatatype_cname) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
154 |
+ cname = name; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
155 |
name->attributes |= |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
156 |
- DNS_NAMEATTR_ANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
157 |
+ DNS_NAMEATTR_ANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
158 |
} |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
159 |
rdataset->attributes |= aflag; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
160 |
if (aa) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
161 |
@@ -6029,11 +6048,11 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
162 |
return (DNS_R_FORMERR); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
163 |
} |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
164 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
165 |
- if (namereln != dns_namereln_subdomain) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
166 |
+ if (dnamereln != dns_namereln_subdomain) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
167 |
char qbuf[DNS_NAME_FORMATSIZE]; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
168 |
char obuf[DNS_NAME_FORMATSIZE]; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
169 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
170 |
- dns_name_format(qname, qbuf, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
171 |
+ dns_name_format(dqname, qbuf, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
172 |
sizeof(qbuf)); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
173 |
dns_name_format(name, obuf, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
174 |
sizeof(obuf)); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
175 |
@@ -6052,7 +6071,7 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
176 |
want_chaining = ISC_TRUE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
177 |
POST(want_chaining); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
178 |
aflag = DNS_RDATASETATTR_ANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
179 |
- result = dname_target(rdataset, qname, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
180 |
+ result = dname_target(rdataset, dqname, |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
181 |
nlabels, &fdname); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
182 |
if (result == ISC_R_NOSPACE) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
183 |
/* |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
184 |
@@ -6068,6 +6087,8 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
185 |
dnameset = rdataset; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
186 |
|
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
187 |
dname = dns_fixedname_name(&fdname); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
188 |
+ dqname = dns_fixedname_name(&fqdname); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
189 |
+ dns_name_copy(dname, dqname, NULL); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
190 |
} else { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
191 |
/* |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
192 |
* We've found a signature that |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
193 |
@@ -6092,6 +6113,10 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
194 |
INSIST(!external); |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
195 |
if (aflag == DNS_RDATASETATTR_ANSWER) { |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
196 |
have_answer = ISC_TRUE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
197 |
+ found_dname = ISC_TRUE; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
198 |
+ if (cname != NULL) |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
199 |
+ cname->attributes &= |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
200 |
+ ~DNS_NAMEATTR_ANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
201 |
name->attributes |= |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
202 |
DNS_NAMEATTR_ANSWER; |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
203 |
} |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
204 |
diff -r 94ec7bb11985 version |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
205 |
--- a/version Thu Oct 27 01:35:34 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
206 |
+++ b/version Fri Oct 28 17:37:53 2016 -0700 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
207 |
@@ -10,4 +10,4 @@ |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
208 |
PATCHVER= |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
209 |
RELEASETYPE=-ESV |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
210 |
RELEASEVER=-R11 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
211 |
-EXTENSIONS=-S8 |
5dcdb05e829c
25026329 Upgrade Solaris to BIND 9.6-ESV-R11-S9
William.D.Johnston <William.D.Johnston@oracle.com>
parents:
diff
changeset
|
212 |
+EXTENSIONS=-S9 |