diff options
| author | jim-p <jimp@pfsense.org> | 2010-09-14 15:22:45 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-09-14 15:22:45 -0400 |
| commit | c03c04ceb3ebe47593cda51d5fea3afecd541f25 (patch) | |
| tree | 7843b267add71265775e4427e033c9527f11db61 | |
| parent | b1c9b5391e99d6826ba114046327d8b9a06525f8 (diff) | |
| download | pfsense-packages-c03c04ceb3ebe47593cda51d5fea3afecd541f25.tar.gz pfsense-packages-c03c04ceb3ebe47593cda51d5fea3afecd541f25.tar.bz2 pfsense-packages-c03c04ceb3ebe47593cda51d5fea3afecd541f25.zip | |
Add LDAP user attribute choice to squid package. Version bump. Submitted-By: vcoque
| -rw-r--r-- | config/squid/squid.inc | 2 | ||||
| -rw-r--r-- | config/squid/squid_auth.xml | 8 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 | ||||
| -rwxr-xr-x | pkg_config.8.xml | 2 | ||||
| -rwxr-xr-x | pkg_config.8.xml.amd64 | 2 |
5 files changed, 12 insertions, 4 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> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 64a5f87b..5fc716eb 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -770,7 +770,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.7.9_1</version> + <version>2.7.9_2</version> <status>Stable</status> <required_version>1.2.1</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index bad928b8..2b041e1e 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -701,7 +701,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.7.9_1</version> + <version>2.7.9_2</version> <status>Stable</status> <required_version>2</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 6415992f..83e41f98 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -932,7 +932,7 @@ <descr>High performance web proxy cache.</descr> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>2.7.9_1</version> + <version>2.7.9_2</version> <status>Stable</status> <required_version>2</required_version> <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> |