Commit be847331 authored by Evan Hunt's avatar Evan Hunt
Browse files

3110. [bug] dnssec-signzone: Wrong error message could appear

			when attempting to sign with no KSK. [RT #24369]
parent 822f6ba1
3110. [bug] dnssec-signzone: Wrong error message could appear
when attempting to sign with no KSK. [RT #24369]
3109. [func] The also-notify option now uses the same syntax 3109. [func] The also-notify option now uses the same syntax
as a zone's masters clause. This means it is as a zone's masters clause. This means it is
now possible to specify a TSIG key to use when now possible to specify a TSIG key to use when
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.275 2011/05/06 21:08:33 each Exp $ */ /* $Id: dnssec-signzone.c,v 1.276 2011/05/07 00:31:13 each Exp $ */
/*! \file */ /*! \file */
...@@ -3906,6 +3906,8 @@ main(int argc, char *argv[]) { ...@@ -3906,6 +3906,8 @@ main(int argc, char *argv[]) {
nokeys = ISC_TRUE; nokeys = ISC_TRUE;
} }
warnifallksk(gdb);
if (IS_NSEC3) { if (IS_NSEC3) {
unsigned int max; unsigned int max;
result = dns_nsec3_maxiterations(gdb, NULL, mctx, &max); result = dns_nsec3_maxiterations(gdb, NULL, mctx, &max);
...@@ -3915,8 +3917,6 @@ main(int argc, char *argv[]) { ...@@ -3915,8 +3917,6 @@ main(int argc, char *argv[]) {
"strength. Maximum iterations allowed %u.", max); "strength. Maximum iterations allowed %u.", max);
} }
warnifallksk(gdb);
gversion = NULL; gversion = NULL;
result = dns_db_newversion(gdb, &gversion); result = dns_db_newversion(gdb, &gversion);
check_result(result, "dns_db_newversion()"); check_result(result, "dns_db_newversion()");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment