diff --git a/CHANGES b/CHANGES
index 6a108ae3d1..a590558886 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/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index e07c2b8049..b31a3af32a 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -1017,7 +1017,7 @@ zone string [ class ] {
dnssec-policy string {
- dnskey-ttl ttlval;
+ dnskey-ttl duration;
keys { ( csk | ksk | zsk ) key-directory lifetime duration algorithm integer [ integer ] ; ... };
parent-ds-ttl duration;
parent-propagation-delay duration;
diff --git a/cocci/return-void-from-void.spatch b/cocci/return-void-from-void.spatch
new file mode 100644
index 0000000000..fcc639f6ea
--- /dev/null
+++ b/cocci/return-void-from-void.spatch
@@ -0,0 +1,19 @@
+@ rule1 @
+identifier f1;
+@@
+
+void f1(...)
+{
+...
+}
+
+@ rule2 @
+identifier rule1.f1;
+identifier f2;
+@@
+
+void f2(...) {
+...
+* return(f1(...));
+...
+}
diff --git a/doc/arm/dnssec-policy.grammar.xml b/doc/arm/dnssec-policy.grammar.xml
index c7df40c4d3..20bc930097 100644
--- a/doc/arm/dnssec-policy.grammar.xml
+++ b/doc/arm/dnssec-policy.grammar.xml
@@ -13,7 +13,7 @@
dnssec-policy string {
- dnskey-ttl ttlval;
+ dnskey-ttl duration;
keys { ( csk | ksk | zsk ) key-directory duration integer [ integer ] ; ... };
parent-ds-ttl duration;
parent-propagation-delay duration;
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 849478d624..97647ca58e 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. */