michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix double line removal

Browse Source
This commit is contained in:
Jamie Cameron
2014-05-18 17:46:58 -07:00
parent 742af86ce5
commit cef7e27ba5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/CHANGELOG Normal file
View File

@@ -0,0 +1,2 @@
---- Changes since 1.680 ----
First version of this module, for configuring the Fail2Ban intrustion detector.

14
fail2ban/fail2ban-lib.pl
View File

@@ -1,6 +1,5 @@
# Functions for configuring the fail2ban log analyser # Functions for configuring the fail2ban log analyser
# #
# XXX deleting a directive removes too many lines?
# XXX local files as seen on debian # XXX local files as seen on debian
# XXX http://virtualmin.com/node/33008 # XXX http://virtualmin.com/node/33008
@@ -276,8 +275,10 @@ if ($old && defined($dir)) {
my $offset = scalar(@dirlines) - $oldlen; my $offset = scalar(@dirlines) - $oldlen;
foreach my $m (@{$sect->{'members'}}) { foreach my $m (@{$sect->{'members'}}) {
next if ($m eq $dir || $m eq $old); next if ($m eq $dir || $m eq $old);
$m->{'line'} += $offset if ($m->{'line'} > $old->{'line'}); if ($m->{'line'} > $old->{'line'}) {
$m->{'eline'} += $offset if ($m->{'line'} > $old->{'line'}); $m->{'line'} += $offset;
$m->{'eline'} += $offset;
}
} }
} }
elsif (!$old && defined($dir)) { elsif (!$old && defined($dir)) {
@@ -296,8 +297,11 @@ elsif ($old && !defined($dir)) {
splice(@{$sect->{'members'}}, $oldidx, 1); splice(@{$sect->{'members'}}, $oldidx, 1);
} }
foreach my $m (@{$sect->{'members'}}) { foreach my $m (@{$sect->{'members'}}) {
$m->{'line'} -= $oldlen if ($m->{'line'} > $old->{'line'}); next if ($m eq $old);
$m->{'eline'} -= $oldlen if ($m->{'line'} > $old->{'line'}); if ($m->{'line'} > $old->{'line'}) {
$m->{'eline'} -= $oldlen;
$m->{'line'} -= $oldlen;
}
} }
} }
&flush_file_lines($sect->{'file'}); &flush_file_lines($sect->{'file'});