aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/squid/squid.inc2
-rw-r--r--config/squid/squid_auth.xml8
2 files changed, 9 insertions, 1 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index f7b5f7b0..7ceea319 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -1018,7 +1018,7 @@ function squid_resync_auth() {
case 'ldap':
$port = (isset($settings['auth_port']) ? ":{$settings['auth_port']}" : '');
$password = (isset($settings['ldap_pass']) ? "-w {$settings['ldap_pass']}" : '');
- $conf .= "auth_param basic program /usr/local/libexec/squid/squid_ldap_auth -v {$settings['ldap_version']} -b {$settings['ldap_basedomain']} -D {$settings['ldap_user']} $password -f \"{$settings['ldap_filter']}\" -u uid -P {$settings['auth_server']}$port\n";
+ $conf .= "auth_param basic program /usr/local/libexec/squid/squid_ldap_auth -v {$settings['ldap_version']} -b {$settings['ldap_basedomain']} -D {$settings['ldap_user']} $password -f \"{$settings['ldap_filter']}\" -u {$settings['ldap_userattribute']} -P {$settings['auth_server']}$port\n";
break;
case 'radius':
$port = (isset($settings['auth_port']) ? "-p {$settings['auth_server_port']}" : '');
diff --git a/config/squid/squid_auth.xml b/config/squid/squid_auth.xml
index 33317d4a..af6ae0b3 100644
--- a/config/squid/squid_auth.xml
+++ b/config/squid/squid_auth.xml
@@ -144,6 +144,14 @@
<size>60</size>
</field>
<field>
+ <fielddescr>LDAP username DN attribute</fielddescr>
+ <fieldname>ldap_userattribute</fieldname>
+ <description>Enter LDAP username DN attibute.</description>
+ <type>input</type>
+ <size>60</size>
+ <default_value>uid</default_value>
+ </field>
+ <field>
<fielddescr>LDAP search filter</fielddescr>
<fieldname>ldap_filter</fieldname>
<description>Enter LDAP search filter.</description>