webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-16 22:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-09-05 16:43:15 +02:00
parent 6dd8a471e4 fd4f39f210
commit 7c0fce586f
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/52/filelists/files
View File

@@ -4,3 +4,4 @@ etc/rc.d/init.d/console
usr/local/sbin/setup
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/proxy.cgi

1
config/rootfiles/core/52/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

1
html/cgi-bin/proxy.cgi
View File

@@ -3147,6 +3147,7 @@ END
if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
{
print FILE "auth_param basic utf8 on\n";
print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; }
if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; }

4
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.1.14
VER = 3.1.15
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd
$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92
install : $(TARGET)