upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 03:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '1460-duration-ttlval-print-bug' into 'master'

Browse source 
Resolve "checkconf test failure on Solaris"

Closes #1460

See merge request isc-projects/bind9!2718
This commit is contained in:
Matthijs Mekking 2019-12-06 13:03:14 +00:00
commit 26ee43da1b
5 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -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".

2
bin/named/named.conf.docbook
View file

@ -1017,7 +1017,7 @@ zone <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
<literallayout class="normal">
dnssec-policy <replaceable>string</replaceable> {
dnskey-ttl <replaceable>ttlval</replaceable>;
dnskey-ttl <replaceable>duration</replaceable>;
keys { ( csk | ksk | zsk ) key-directory lifetime <replaceable>duration</replaceable> algorithm <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ] ; ... };
parent-ds-ttl <replaceable>duration</replaceable>;
parent-propagation-delay <replaceable>duration</replaceable>;

19
cocci/return-void-from-void.spatch Normal file
View file

@ -0,0 +1,19 @@
@ rule1 @
identifier f1;
@@
void f1(...)
{
...
}
@ rule2 @
identifier rule1.f1;
identifier f2;
@@
void f2(...) {
...
* return(f1(...));
...
}

2
doc/arm/dnssec-policy.grammar.xml
View file

@ -13,7 +13,7 @@
<programlisting>
<command>dnssec-policy</command> <replaceable>string</replaceable> {
<command>dnskey-ttl</command> <replaceable>ttlval</replaceable>;
<command>dnskey-ttl</command> <replaceable>duration</replaceable>;
<command>keys</command> { ( csk | ksk | zsk ) key-directory <replaceable>duration</replaceable> <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ] ; ... };
<command>parent-ds-ttl</command> <replaceable>duration</replaceable>;
<command>parent-propagation-delay</command> <replaceable>duration</replaceable>;

3
lib/isccfg/parser.c
View file

@ -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. */