michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-08 00:40:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add flag to force key re-generation https://github.com/virtualmin/virtualmin-gpl/issues/406

Browse Source
This commit is contained in:
Jamie Cameron
2022-06-18 12:47:11 -07:00
parent 005568c133
commit b5ce93bcac
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bind8/bind8-lib.pl
View File

@@ -3288,12 +3288,13 @@ else {
}
}
# create_dnssec_key(&zone|&zone-name, algorithm, size, single-key)
# create_dnssec_key(&zone|&zone-name, algorithm, size, single-key,
# [force-regen])
# Creates a new DNSSEC key for some zone, and places it in the same directory
# as the zone file. Returns undef on success or an error message on failure.
sub create_dnssec_key
{
my ($z, $alg, $size, $single) = @_;
my ($z, $alg, $size, $single, $force) = @_;
my $fn = &get_keys_dir($z);
$fn || return "Could not work keys directory!";
my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
@@ -3329,6 +3330,17 @@ else {
# Check if there are saved keys, and if so use them
my @savedkeys = grep { $_->{'saved'} } &get_dnssec_key($z, 1);
my $out;
if (@savedkeys && $force) {
# Delete any saved keys, to force re-generation
foreach my $key (@savedkeys) {
foreach my $f ('publicfile', 'privatefile') {
if (ref($key) && $key->{$f} && $key->{'saved'}) {
&unlink_file($key->{$f});
}
}
}
@savedkeys = ( );
}
if (@savedkeys) {
# Rename back the saved key files
foreach my $key (@savedkeys) {