Fixed build and core 11

This commit is contained in:
Christian Schmidt
2008-04-06 16:41:02 +02:00
parent e65017ca4c
commit 3900a6c7b6
5 changed files with 13 additions and 27 deletions

View File

@@ -3685,7 +3685,7 @@ END
print FILE "\nnever_direct allow all\n\n";
}
if (($proxysettings{'ENABLE_FILTER'} eq 'on') && ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on'))
if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
{
print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
@@ -3694,27 +3694,6 @@ END
} else {
print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
}
} else
{
if ($proxysettings{'ENABLE_FILTER'} eq 'on')
{
print FILE <<END
url_rewrite_program /usr/sbin/redirect_wrapper
url_rewrite_children $filtersettings{'CHILDREN'}
END
;
}
if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')
{
print FILE <<END
url_rewrite_program /usr/sbin/redirect_wrapper
url_rewrite_children $xlratorsettings{'CHILDREN'}
END
;
}
}
close FILE;
}