Make sure deleted files aren't written out again

diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl
index add6773..ced655b 100755 (executable)
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -1736,9 +1736,7 @@ if ($config{'link_dir'}) {
        local $short = $file;
        $short =~ s/^.*\///;
        local $linksrc = "$config{'link_dir'}/$short";
-       &lock_file($linksrc);
-       unlink($linksrc);
-       &unlock_file($linksrc);
+       &unlink_logged($linksrc);
        }
 }
 

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 71149a0..ba2e76a 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -5118,6 +5118,7 @@ return 1 if (&is_readonly_mode());
 my $rv = 1;
 my $err;
 foreach my $f (@_) {
+       &unflush_file_lines($f);
        my $realf = &translate_filename($f);
        &webmin_debug_log('UNLINK', $realf) if ($gconfig{'debug_what_ops'});
        if (-d $realf) {