From f7743cb2b5619a1f2d0e0a69cb1b863e848725d1 Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 16 Sep 2010 11:34:29 -0400 Subject: Fix NT Auth on squid pkg, fix some JS and field names. Submitted-By: vcoque --- config/squid/squid.inc | 42 ++++++++++++++++++++++++++++++++++-------- config/squid/squid_auth.xml | 7 +++++++ 2 files changed, 41 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 7ceea319..8a44d02c 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -1016,16 +1016,17 @@ function squid_resync_auth() { $conf .= 'auth_param basic program /usr/local/libexec/squid/ncsa_auth ' . SQUID_PASSWD . "\n"; break; case 'ldap': - $port = (isset($settings['auth_port']) ? ":{$settings['auth_port']}" : ''); + $port = (isset($settings['auth_server_port']) ? ":{$settings['auth_server_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 {$settings['ldap_userattribute']} -P {$settings['auth_server']}$port\n"; break; case 'radius': - $port = (isset($settings['auth_port']) ? "-p {$settings['auth_server_port']}" : ''); + $port = (isset($settings['auth_server_port']) ? "-p {$settings['auth_server_port']}" : ''); $conf .= "auth_param basic program /usr/local/libexec/squid/squid_radius_auth -w {$settings['radius_secret']} -h {$settings['auth_server']} $port\n"; break; case 'msnt': $conf .= "auth_param basic program /usr/local/libexec/squid/msnt_auth\n"; + squid_resync_msnt(); break; } $conf .= <<input 60 + + NT domain + auth_ntdomain + Enter here the NT domain. + input + 60 + LDAP server user DN ldap_user -- cgit v1.2.3