From 22527178743ed4a13687e53b3478eb17e2ae13c6 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Wed, 6 Jun 2007 17:50:25 +0000 Subject: [PATCH] Squid gefixt damit auch andere auth meachanismen funktionieren git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@613 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/language_issues.de | 3 ++- doc/language_issues.en | 3 ++- html/cgi-bin/proxy.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/squid | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index cfc26ea484..5db31c9876 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -175,6 +175,7 @@ WARNING: translation string unused: iowait WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipfire side is invalid +WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -224,6 +225,7 @@ WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later @@ -363,4 +365,3 @@ WARNING: translation string unused: written sectors WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: qos graphs diff --git a/doc/language_issues.en b/doc/language_issues.en index 3001d4e7f7..0f7239ba52 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -186,6 +186,7 @@ WARNING: translation string unused: iowait WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: ipfire side is invalid +WARNING: translation string unused: iptable rules WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -235,6 +236,7 @@ WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later @@ -366,4 +368,3 @@ WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: written sectors WARNING: translation string unused: year WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: qos graphs diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index e0d8452bbe..ee44b0e344 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2166,7 +2166,7 @@ if (-e $disgrp) # If the password file contains entries, print entries and action icons -if (! -z "$userdb") { +if ( $userdb ne "" ) { print < $Lang::tr{'advproxy NCSA username'} @@ -2733,7 +2733,7 @@ sub write_acls sub writepacfile { - open(FILE, ">/home/httpd/html/proxy.pac"); + open(FILE, ">/srv/web/ipfire/html/proxy.pac"); flock(FILE, 2); print FILE "function FindProxyForURL(url, host)\n"; print FILE "{\n"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d7d8e6452c..3173e7fd69 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1199,6 +1199,7 @@ 'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', +'qos graphs' => 'Qos Diagramme', 'ram' => 'RAM-Speicher', 'read list' => 'Liste der Leseberechtigten', 'read sectors' => 'Sektoren lesen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2d784fc5b4..ade961edb0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1207,6 +1207,7 @@ 'psk' => 'PSK', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', +'qos graphs' => 'Qos Graphs', 'quick control' => 'Quick Control', 'ram' => 'RAM', 'read list' => 'list with readonly hosts', diff --git a/lfs/squid b/lfs/squid index 2bdf5bea82..54a9614727 100644 --- a/lfs/squid +++ b/lfs/squid @@ -125,8 +125,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 755 /var/log/updatexlrator chwon squid:squid /var/log/squid - mkdir /var/ipfire/proxy/advanced/auth - cp -f $(DIR_SRC)/config/proxy/auth /var/ipfire/proxy/advanced/auth + mkdir /usr/lib/squid/auth + cp -f $(DIR_SRC)/config/proxy/auth /usr/lib/squid/auth cp -f $(DIR_SRC)/config/proxy/proxy.pac /srv/web/ipfire/html/proxy.pac chown nobody.nobody /srv/web/ipfire/html/proxy.pac ln -f /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html//wpad.dat -- 2.39.2