Commit 226339ed authored by Evan Hunt's avatar Evan Hunt

[master] spurious spaces in named-checkconf -p

4205.	[bug]		'named-checkconf -p' could include unwanted spaces
			when printing tuples with unset optional fields.
			[RT #40731]
parent 5091a6fe
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]
......
......@@ -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.";
......
......@@ -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);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment