mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Don't die if a child's key is in the zone and a signedkey file is present.

Browse Source
This commit is contained in:
Brian Wellington
2001-01-12 23:36:03 +00:00
parent f0e246e271
commit b43d1c1f46
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/dnssec/dnssec-signzone.c
View File

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.128 2001/01/12 01:38:21 bwelling Exp $ */ /* $Id: dnssec-signzone.c,v 1.129 2001/01/12 23:36:03 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -839,8 +839,14 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
if (result == ISC_R_SUCCESS && childkey) { if (result == ISC_R_SUCCESS && childkey) {
char namestr[DNS_NAME_FORMATSIZE]; char namestr[DNS_NAME_FORMATSIZE];
dns_name_format(name, namestr, sizeof namestr); dns_name_format(name, namestr, sizeof namestr);
fatal("%s has both a signedkey file and KEY " if (hasnullkey(&keyset)) {
"records in the zone. Aborting.", namestr); fatal("%s has both a signedkey file and "
"null keys in the zone. Aborting.",
namestr);
}
vbprintf(2, "child key for %s found\n", namestr);
neednullkey = ISC_FALSE;
dns_rdataset_disassociate(&keyset);
} }
else if (result == ISC_R_SUCCESS) { else if (result == ISC_R_SUCCESS) {
if (hasnullkey(&keyset)) if (hasnullkey(&keyset))