From: hno <>
Date: Tue, 1 May 2001 00:27:06 +0000 (+0000)
Subject: Oops.. had deleted the default for -u in a cleanup. This was not intentional.
X-Git-Tag: SQUID_3_0_PRE1~1521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=963b6afb974e1c4bceaa32ba2f98c093c779394e;p=thirdparty%2Fsquid.git

Oops.. had deleted the default for -u in a cleanup. This was not intentional.
---

diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.8 b/helpers/basic_auth/LDAP/squid_ldap_auth.8
index 03badc983e..e0cf63e210 100644
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.8
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.8
@@ -1,4 +1,4 @@
-.TH squid_ldap_auth 8 "18 April 2001" "Squid LDAP Auth"
+.TH squid_ldap_auth 8 "30 April 2001" "Squid LDAP Auth"
 .SH NAME
 squid_ldap_auth - Squid LDAP authentication helper
 .SH SYNOPSIS
@@ -80,7 +80,7 @@ you need to specify is usually the base DN under where your users
 are located, and the server name.
 .
 .IP
-squid_ldap_auth -b dc=your,dc=domain ldapserver
+squid_ldap_auth -b ou=peopl,dc=your,dc=domain ldapserver
 .P
 If you have sub-domains then you need to use a search filter to locate
 the users
@@ -88,7 +88,8 @@ the users
 squid_ldap_auth -b dc=your,dc=domain -f uid=%s ldapserver
 .P
 Or if the user attribute of the user DN is "cn" instead of "uid" then 
-you could use something like the following (for Active Directory)
+you could use something like the following (for Active Directory) if
+you do not want to search for the user DN
 .IP
 squid_ldap_auth -u cn -b cn=Users,dc=your,dc=domain ldapserver
 .P
diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.c b/helpers/basic_auth/LDAP/squid_ldap_auth.c
index 1f3c30f430..014f707a9c 100644
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.c
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.c
@@ -49,7 +49,7 @@ static char *basedn;
 static char *searchfilter = NULL;
 static char *binddn = NULL;
 static char *bindpasswd = NULL;
-static char *userattr = NULL;
+static char *userattr = "uid";
 static int searchscope = LDAP_SCOPE_SUBTREE;
 static int persistent = 0;
 static int noreferrals = 0;