From: Mark Andrews <marka@isc.org>
Date: Fri, 11 Dec 2020 03:07:31 +0000 (+1100)
Subject: Update dnssec-signzone -N soa-serial-format description
X-Git-Tag: v9.16.11~16^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=151500b522939df078c3096718e4cd9d830f1ce6;p=thirdparty%2Fbind9.git

Update dnssec-signzone -N soa-serial-format description

document the autoincrement when the serial would go backwards.

(cherry picked from commit eb1b29b19ecf5b0bfb2e2b9dc56972d5f015859e)
---

diff --git a/bin/dnssec/dnssec-signzone.rst b/bin/dnssec/dnssec-signzone.rst
index 7a4c801fad9..2b395ef95d4 100644
--- a/bin/dnssec/dnssec-signzone.rst
+++ b/bin/dnssec/dnssec-signzone.rst
@@ -203,10 +203,16 @@ Options
       Increment the SOA serial number using :rfc:`1982` arithmetic.
 
    ``"unixtime"``
-      Set the SOA serial number to the number of seconds since epoch.
+      This format sets the SOA serial number to the number of seconds
+      since the beginning of the Unix epoch, unless the serial
+      number is already greater than or equal to that value, in
+      which case it is simply incremented by one.
 
    ``"date"``
-      Set the SOA serial number to today's date in YYYYMMDDNN format.
+      This format sets the SOA serial number to today's date, in
+      YYYYMMDDNN format, unless the serial number is already greater
+      than or equal to that value, in which case it is simply
+      incremented by one.
 
 **-o** origin
    The zone origin. If not specified, the name of the zone file is
diff --git a/doc/man/dnssec-signzone.8in b/doc/man/dnssec-signzone.8in
index 7eaad271a31..5bc522be5a8 100644
--- a/doc/man/dnssec-signzone.8in
+++ b/doc/man/dnssec-signzone.8in
@@ -204,10 +204,16 @@ Do not modify the SOA serial number.
 Increment the SOA serial number using \fI\%RFC 1982\fP arithmetic.
 .TP
 .B \fB"unixtime"\fP
-Set the SOA serial number to the number of seconds since epoch.
+This format sets the SOA serial number to the number of seconds
+since the beginning of the Unix epoch, unless the serial
+number is already greater than or equal to that value, in
+which case it is simply incremented by one.
 .TP
 .B \fB"date"\fP
-Set the SOA serial number to today\(aqs date in YYYYMMDDNN format.
+This format sets the SOA serial number to today\(aqs date, in
+YYYYMMDDNN format, unless the serial number is already greater
+than or equal to that value, in which case it is simply
+incremented by one.
 .UNINDENT
 .TP
 \fB\-o\fP origin