VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-19 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include password restrictions in config restore

Browse Source
This commit is contained in:
Jamie Cameron
2018-02-18 14:07:40 -08:00
parent aae5608dd2
commit c39766177e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acl/backup_config.pl
View File

@ -83,17 +83,18 @@ foreach my $k (keys %aclbackup) {
} }
&write_file("$config_directory/config", \%gconfig); &write_file("$config_directory/config", \%gconfig);
# Splice miniserv.conf entries for users into real config # Splice miniserv.conf entries for users and password restrictions into
# real config
%aclbackup = ( ); %aclbackup = ( );
&read_file("$config_directory/miniserv.conf.aclbackup", \%aclbackup); &read_file("$config_directory/miniserv.conf.aclbackup", \%aclbackup);
unlink("$config_directory/miniserv.conf.aclbackup"); unlink("$config_directory/miniserv.conf.aclbackup");
my %miniserv; my %miniserv;
&get_miniserv_config(\%miniserv); &get_miniserv_config(\%miniserv);
foreach my $k (keys %miniserv) { foreach my $k (keys %miniserv) {
delete($miniserv{$k}) if ($k =~ /^(preroot_)/); delete($miniserv{$k}) if ($k =~ /^(preroot_|pass_)/);
} }
foreach my $k (keys %aclbackup) { foreach my $k (keys %aclbackup) {
$miniserv{$k} = $aclbackup{$k} if ($k =~ /^(preroot_)/); $miniserv{$k} = $aclbackup{$k} if ($k =~ /^(preroot_|pass_)/);
} }
&put_miniserv_config(\%miniserv); &put_miniserv_config(\%miniserv);