From: Evan Hunt <each@isc.org>
Date: Tue, 18 Sep 2012 21:22:33 +0000 (-0700)
Subject: remove spurious newline
X-Git-Tag: v9.10.0a1~880
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=664320a88f4782d0bccf012da01a39dd54632d24;p=thirdparty%2Fbind9.git

remove spurious newline

3377.	[bug]		Removed spurious newline from NSEC3 multiline
			output. [RT #31044]
---

diff --git a/CHANGES b/CHANGES
index 14efda3be2a..f4693769968 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3377.	[bug]		Removed spurious newline from NSEC3 multiline
+			output. [RT #31044]
+
 3376.	[bug]		Lack of EDNS support was being recorded without a
 			successful response. [RT #30811]
 
diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 14962d3f309..19b94efa06d 100644
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -194,9 +194,7 @@ totext_nsec3(ARGS_TOTEXT) {
 	RETERR(isc_base32hex_totext(&sr, 1, "", target));
 	sr.length = i - j;
 
-	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
-		RETERR(str_totext(tctx->linebreak, target));
-	else
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) == 0)
 		RETERR(str_totext(" ", target));
 
 	/* Types covered */