mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

[master] spurious spaces in named-checkconf -p

Browse Source 
4205.	[bug]		'named-checkconf -p' could include unwanted spaces
			when printing tuples with unset optional fields.
			[RT #40731]
This commit is contained in:
Evan Hunt
2015-09-14 08:50:17 -07:00
parent 5091a6fed9
commit 226339ed43
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
4205. [bug] 'named-checkconf -p' could include unwanted spaces
when printing tuples with unset optional fields.
[RT #40731]
4204. [bug] 'dig +trace' failed to lookup the correct type if
the initial root ns query was retried. [RT #40296]

2
bin/tests/system/checkconf/good.conf
View File

@@ -116,7 +116,7 @@ view "second" {
zone "." {
type redirect;
masters {
1.2.3.4 ;
1.2.3.4;
};
};
dnssec-lookaside "." trust-anchor "dlv.isc.org.";

5
lib/isccfg/parser.c
View File

@@ -272,10 +272,11 @@ cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) {
for (f = fields, i = 0; f->name != NULL; f++, i++) {
const cfg_obj_t *fieldobj = obj->value.tuple[i];
if (need_space)
if (need_space && fieldobj->type->rep != &cfg_rep_void)
cfg_print_cstr(pctx, " ");
cfg_print_obj(pctx, fieldobj);
need_space = ISC_TF(fieldobj->type->print != cfg_print_void);
need_space = ISC_TF(need_space ||
fieldobj->type->print != cfg_print_void);
}
}