mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00
Code Issues Releases Wiki Activity

4194. [bug] named-checkconf -p failed to properly print a port

Browse Source 
range.  [RT #40634]
This commit is contained in:
Mark Andrews 2015-09-09 16:49:11 +10:00
parent f6e04b5923
commit fbd9aaa58c
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
4194. [bug] named-checkconf -p failed to properly print a port
range. [RT #40634]
4193. [bug] Handle broken servers that return BADVERS incorrectly.
[RT #40427]

9
bin/tests/system/checkconf/portrange-good.conf Normal file
View File

@ -0,0 +1,9 @@
options {
avoid-v4-udp-ports {
1935;
2605;
4321;
6514;
range 8610 8614;
};
};

7
bin/tests/system/checkconf/tests.sh
View File

@ -247,5 +247,12 @@ grep "zone check-mx-cname/IN: loaded serial" < checkconf.out6 > /dev/null && ret
if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
status=`expr $status + $ret`
echo "I: check that named-checkconf -p properly print a port range"
ret=0
$CHECKCONF -p portrange-good.conf > checkconf.out7 2>&1 || ret=1
grep "range 8610 8614;" checkconf.out7 > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
exit $status

7
lib/isccfg/namedconf.c
View File

@ -809,13 +809,18 @@ static cfg_type_t cfg_type_serverid = {
/*%
* Port list.
*/
static void
print_porttuple(cfg_printer_t *pctx, const cfg_obj_t *obj) {
cfg_print_cstr(pctx, "range ");
cfg_print_tuple(pctx, obj);
}
static cfg_tuplefielddef_t porttuple_fields[] = {
{ "loport", &cfg_type_uint32, 0 },
{ "hiport", &cfg_type_uint32, 0 },
{ NULL, NULL, 0 }
};
static cfg_type_t cfg_type_porttuple = {
"porttuple", cfg_parse_tuple, cfg_print_tuple, cfg_doc_tuple,
"porttuple", cfg_parse_tuple, print_porttuple, cfg_doc_tuple,
&cfg_rep_tuple, porttuple_fields
};