From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 6 Dec 2019 12:12:06 +0000 (+0100)
Subject: Fix duration printing on Solaris
X-Git-Tag: v9.15.7~32^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60fa5fc7604350b2e8e972e73376cb6c9410fe20;p=thirdparty%2Fbind9.git

Fix duration printing on Solaris
---

diff --git a/CHANGES b/CHANGES
index 6a108ae3d19..a5905588869 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5333.	[bug]		Fix duration printing on Solaris when value is not
+			an ISO 8601 duration. [GL #1460]
+
 5332.	[func]		Renamed "dnssec-keys" configuration statement
 			to the more descriptive "trust-anchors".
 
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 849478d6249..97647ca58ee 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1022,7 +1022,8 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) {
 
 	/* If this is not an ISO 8601 duration, just print it as a number. */
 	if (!duration.iso8601) {
-		return (cfg_print_rawuint(pctx, duration.parts[6]));
+		cfg_print_rawuint(pctx, duration.parts[6]);
+		return;
 	}
 
 	/* Calculate length of string. */