/[smecontribs]/rpms/smeserver-dansguardian-panel/contribs8/smeserver-dansguardian-panel-2.11-x64sup.patch
ViewVC logotype

Contents of /rpms/smeserver-dansguardian-panel/contribs8/smeserver-dansguardian-panel-2.11-x64sup.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Wed Sep 25 19:42:29 2013 UTC (11 years, 1 month ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-dansguardian-panel-2_11-5, smeserver-dansguardian-panel-2_11-7, smeserver-dansguardian-panel-2_11-6, HEAD
Changes since 1.1: +5 -5 lines
Error occurred while calculating annotation data.
* Wed Sep 25 2013 JP Pialasse <tests@pialasse.com> 2.11-5.sme
- x64 support [SME: 7866]

1 diff -up smeserver-dansguardian-panel-2.11/root/etc/e-smith/templates/etc/squid/squid.conf/15AuthProgramLdap.x64sup smeserver-dansguardian-panel-2.11/root/etc/e-smith/templates/etc/squid/squid.conf/15AuthProgramLdap
2 --- smeserver-dansguardian-panel-2.11/root/etc/e-smith/templates/etc/squid/squid.conf/15AuthProgramLdap.x64sup 2008-10-24 07:49:48.000000000 -0400
3 +++ smeserver-dansguardian-panel-2.11/root/etc/e-smith/templates/etc/squid/squid.conf/15AuthProgramLdap 2013-09-25 12:01:49.000000000 -0400
4 @@ -3,11 +3,18 @@ return "" unless ( ($squid{RequireAuth}
5
6 my $dn = $squid{dn} || "dc=232,dc=net";
7 my $host = $squid{host} || "k8.232.net";
8 +my $usrpath='/usr/lib';
9 +
10 +if ( -d "/usr/lib64/squid" )
11 +{
12 + $usrpath='/usr/lib64';
13 +}
14 +
15
16 $OUT .= "
17 -auth_param basic program /usr/lib/squid/squid_ldap_auth -b $dn -f uid=%s -h $host
18 +auth_param basic program $usrpath/squid/squid_ldap_auth -b $dn -f uid=%s -h $host
19 auth_param basic children 5
20 auth_param basic realm squid proxy server
21 auth_param basic credentialsttl 2 hours
22 auth_param basic casesensitive off
23 -";}
24 \ Pas de fin de ligne à la fin du fichier.
25 +";}

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed