Make sure access rules come after acls
authorJamie Cameron <jcameron@webmin.com>
Fri, 7 Dec 2007 19:49:19 +0000 (19:49 +0000)
committerJamie Cameron <jcameron@webmin.com>
Fri, 7 Dec 2007 19:49:19 +0000 (19:49 +0000)
squid/http_access_save.cgi
squid/icp_access_save.cgi

index 5a8f7f5..4de353e 100755 (executable)
@@ -26,7 +26,7 @@ else {
        if ($http) { splice(@https, &indexof($http, @https), 1, $newhttp); }
        else { push(@https, $newhttp); }
        }
-&save_directive($conf, "http_access", \@https);
+&save_directive($conf, "http_access", \@https, "acl");
 &flush_file_lines();
 &unlock_file($config{'squid_conf'});
 &webmin_log($in{'delete'} ? 'delete' : $http ? 'modify' : 'create', "http");
index 8d328e2..ac26107 100755 (executable)
@@ -26,7 +26,7 @@ else {
        if ($icp) { splice(@icps, &indexof($icp, @icps), 1, $newicp); }
        else { push(@icps, $newicp); }
        }
-&save_directive($conf, "icp_access", \@icps);
+&save_directive($conf, "icp_access", \@icps, "acl");
 &flush_file_lines();
 &unlock_file($config{'squid_conf'});
 &webmin_log($in{'delete'} ? 'delete' : $icp ? 'modify' : 'create', "icp");