From: Mark Andrews <marka@isc.org>
Date: Thu, 28 Feb 2019 04:39:37 +0000 (+1100)
Subject: add brackets for multi-line output
X-Git-Tag: v9.15.0~66^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40a770b9329b2b00ab0e5d9011a0bad43f4e7886;p=thirdparty%2Fbind9.git

add brackets for multi-line output
---

diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c
index 9768d383a6e..e22ac4ae7ab 100644
--- a/lib/dns/rdata/in_1/eid_31.c
+++ b/lib/dns/rdata/in_1/eid_31.c
@@ -41,12 +41,19 @@ totext_in_eid(ARGS_TOTEXT) {
 
 	dns_rdata_toregion(rdata, &region);
 
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
+		RETERR(str_totext("( ", target));
+	}
 	if (tctx->width == 0) {
-		return (isc_hex_totext(&region, 60, "", target));
+		RETERR(isc_hex_totext(&region, 60, "", target));
 	} else {
-		return (isc_hex_totext(&region, tctx->width - 2,
-				       tctx->linebreak, target));
+		RETERR(isc_hex_totext(&region, tctx->width - 2,
+				      tctx->linebreak, target));
+	}
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
+		RETERR(str_totext(" )", target));
 	}
+	return (ISC_R_SUCCESS);
 }
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c
index bf7429232b7..1070a4e8c0b 100644
--- a/lib/dns/rdata/in_1/nimloc_32.c
+++ b/lib/dns/rdata/in_1/nimloc_32.c
@@ -41,12 +41,19 @@ totext_in_nimloc(ARGS_TOTEXT) {
 
 	dns_rdata_toregion(rdata, &region);
 
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
+		RETERR(str_totext("( ", target));
+	}
 	if (tctx->width == 0) {
-		return (isc_hex_totext(&region, 60, "", target));
+		RETERR(isc_hex_totext(&region, 60, "", target));
 	} else {
-		return (isc_hex_totext(&region, tctx->width - 2,
-				       tctx->linebreak, target));
+		RETERR(isc_hex_totext(&region, tctx->width - 2,
+				      tctx->linebreak, target));
+	}
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) {
+		RETERR(str_totext(" )", target));
 	}
+	return (ISC_R_SUCCESS);
 }
 
 static inline isc_result_t