Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
31affb2c
Commit
31affb2c
authored
Oct 05, 2004
by
Mark Andrews
Browse files
1732. [bug] 'rrset-order name "*"' wasn't being applied to ".".
[RT #12467]
parent
9548800b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
31affb2c
...
...
@@ -13,7 +13,8 @@
1733. [bug] Return non-zero exit status on initial load failure.
[RT #12658]
1732. [placeholder] rt12467
1732. [bug] 'rrset-order name "*"' wasn't being applied to ".".
[RT #12467]
1731. [port] darwin: relax version test in ifconfig.sh.
[RT #12581]
...
...
bin/named/server.c
View file @
31affb2c
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.4
29
2004/
09/29 06:45:3
7 marka Exp $ */
/* $Id: server.c,v 1.4
30
2004/
10/05 04:38:1
7 marka Exp $ */
#include
<config.h>
...
...
@@ -522,6 +522,7 @@ configure_order(dns_order_t *order, cfg_obj_t *ent) {
const
char
*
str
;
isc_buffer_t
b
;
isc_result_t
result
;
isc_boolean_t
addroot
;
result
=
ns_config_getclass
(
cfg_tuple_get
(
ent
,
"class"
),
dns_rdataclass_any
,
&
rdclass
);
...
...
@@ -538,11 +539,12 @@ configure_order(dns_order_t *order, cfg_obj_t *ent) {
str
=
cfg_obj_asstring
(
obj
);
else
str
=
"*"
;
addroot
=
ISC_TF
(
strcmp
(
str
,
"*"
)
==
0
);
isc_buffer_init
(
&
b
,
str
,
strlen
(
str
));
isc_buffer_add
(
&
b
,
strlen
(
str
));
dns_fixedname_init
(
&
fixed
);
result
=
dns_name_fromtext
(
dns_fixedname_name
(
&
fixed
),
&
b
,
dns_rootname
,
ISC_FALSE
,
NULL
);
dns_rootname
,
ISC_FALSE
,
NULL
);
if
(
result
!=
ISC_R_SUCCESS
)
return
(
result
);
...
...
@@ -558,6 +560,18 @@ configure_order(dns_order_t *order, cfg_obj_t *ent) {
else
INSIST
(
0
);
/*
* "*" should match everything including the root (BIND 8 compat).
* As dns_name_matcheswildcard(".", "*.") returns FALSE add a
* explict entry for "." when the name is "*".
*/
if
(
addroot
)
{
result
=
dns_order_add
(
order
,
dns_rootname
,
rdtype
,
rdclass
,
mode
);
if
(
result
!=
ISC_R_SUCCESS
)
return
(
result
);
}
return
(
dns_order_add
(
order
,
dns_fixedname_name
(
&
fixed
),
rdtype
,
rdclass
,
mode
));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment