Fix config backup of external ACLs file.

Handle URL options in Squid 2.6.

diff --git a/squid/backup_config.pl b/squid/backup_config.pl
index c02fb24..e0e0496 100755 (executable)
--- a/squid/backup_config.pl
+++ b/squid/backup_config.pl
@@ -17,7 +17,7 @@ push(@rv, $file) if ($file);
 local @acl = &find_config("acl", $conf);
 local $a;
 foreach $a (@acl) {
-       if ($a->{'values'}->[2] =~ /^"(.*)"$/) {
+       if ($a->{'values'}->[2] =~ /^"(.*)"$/ || $a->{'values'}->[3] =~ /^"(.*)"$/) {
                push(@rv, $1);
                }
        }

diff --git a/squid/edit_progs.cgi b/squid/edit_progs.cgi
index 4132dd6..d56a351 100755 (executable)
--- a/squid/edit_progs.cgi
+++ b/squid/edit_progs.cgi
@@ -56,15 +56,28 @@ print &opt_input($text{'eprogs_spp'}, "pinger_program", $conf,
                 $text{'default'}, 40, &file_chooser_button("pinger_program"));
 print "</tr>\n";
 
-print "<tr>\n";
-print &opt_input($text{'eprogs_crp'}, "redirect_program", $conf,
-                $text{'none'}, 40, &file_chooser_button("redirect_program"));
-print "</tr>\n";
+if ($squid_version >= 2.6) {
+       print "<tr>\n";
+        print &opt_input($text{'eprogs_crp'}, "url_rewrite_program", $conf,
+                         $text{'none'}, 40, &file_chooser_button("url_rewrite_program"));
+        print "</tr>\n";
 
-print "<tr>\n";
-print &opt_input($text{'eprogs_norp'}, "redirect_children", $conf,
-                $text{'default'}, 6);
-print "</tr>\n";
+        print "<tr>\n";
+        print &opt_input($text{'eprogs_norp'}, "url_rewrite_children", $conf,
+                         $text{'default'}, 6);
+        print "</tr>\n";
+       }
+else {
+       print "<tr>\n";
+       print &opt_input($text{'eprogs_crp'}, "redirect_program", $conf,
+                        $text{'none'}, 40, &file_chooser_button("redirect_program"));
+       print "</tr>\n";
+
+       print "<tr>\n";
+       print &opt_input($text{'eprogs_norp'}, "redirect_children", $conf,
+                        $text{'default'}, 6);
+       print "</tr>\n";
+       }
 
 print "</table></td></tr></table>\n";
 print "<input type=submit value='$text{'buttsave'}'></form>\n";

diff --git a/squid/save_progs.cgi b/squid/save_progs.cgi
index 9cde03c..9b95fee 100755 (executable)
--- a/squid/save_progs.cgi
+++ b/squid/save_progs.cgi
@@ -25,8 +25,14 @@ if ($squid_version >= 2) {
        }
 &save_opt("unlinkd_program", \&check_prog, $conf);
 &save_opt("pinger_program", \&check_prog, $conf);
-&save_opt("redirect_program", \&check_prog, $conf);
-&save_opt("redirect_children", \&check_children, $conf);
+if ($squid_version >= 2.6) {
+       &save_opt("url_rewrite_program", \&check_prog, $conf);
+        &save_opt("url_rewrite_children", \&check_children, $conf);
+       }
+else {
+       &save_opt("redirect_program", \&check_prog, $conf);
+       &save_opt("redirect_children", \&check_children, $conf);
+       }
 
 &flush_file_lines();
 &unlock_file($config{'squid_conf'});