From 200dae2390eb484289a054ea884c5159f4e8583e Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sat, 27 Dec 2014 12:09:06 -0800 Subject: [PATCH] Handle relative links to sites-available properly http://virtualmin.com/node/35658 --- apache/apache-lib.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl index 9f122dae2..e4fa8d4f5 100755 --- a/apache/apache-lib.pl +++ b/apache/apache-lib.pl @@ -1844,7 +1844,8 @@ if ($config{'link_dir'}) { opendir(LINKDIR, $config{'link_dir'}); foreach my $f (readdir(LINKDIR)) { if ($f ne "." && $f ne ".." && - (&resolve_links($config{'link_dir'}."/".$f) eq $file || + (&simpify_path( + &resolve_links($config{'link_dir'}."/".$f)) eq $file || $short eq $f)) { &unlink_logged($config{'link_dir'}."/".$f); }