upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2788. [bug] dnssec-signzone could sign with keys that were

Browse source 
not requested [RT #20625]
This commit is contained in:
Evan Hunt 2009-11-25 03:17:11 +00:00
parent fc1fb1a469
commit ce3b2c5189
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2788. [bug] dnssec-signzone could sign with keys that were
not requested [RT #20625]
2787. [bug] Spurious log message when zone keys were
dynamically reconfigured. [RT #20659]

14
bin/dnssec/dnssec-signzone.c
View file

@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dnssec-signzone.c,v 1.255 2009/11/24 03:42:31 each Exp $ */
/* $Id: dnssec-signzone.c,v 1.256 2009/11/25 03:17:11 each Exp $ */
/*! \file */
@ -3643,16 +3643,18 @@ main(int argc, char *argv[]) {
/*
* Fill keylist with:
* 1) Keys listed in the DNSKEY set that have
* private keys associated
* 2) KSKs set on the command line
* 3) ZSKs set on the command line
* private keys associated, *if* no keys were
* set on the command line.
* 2) ZSKs set on the command line
* 3) KSKs set on the command line
* 4) Any keys remaining in the DNSKEY set which
* do not have private keys associated and were
* not specified on the command line.
*/
loadzonekeys(!smartsign, ISC_FALSE);
loadexplicitkeys(dskeyfile, ndskeys, ISC_TRUE);
if (argc == 0 || smartsign)
loadzonekeys(!smartsign, ISC_FALSE);
loadexplicitkeys(argv, argc, ISC_FALSE);
loadexplicitkeys(dskeyfile, ndskeys, ISC_TRUE);
loadzonekeys(!smartsign, ISC_TRUE);
/*