Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 122365 - Allow installation definable LDAP filters

Browse Source 
r,a=justdave


git-svn-id: svn://10.0.0.236/trunk@144823 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bbaetz%acm.org
2003-07-14 13:35:12 +00:00
parent 8894fc9d19
commit f4bc6f6af5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/webtools/bugzilla/Bugzilla/Auth/LDAP.pm
View File

@@ -84,7 +84,7 @@ sub authenticate {
# We've got our anonymous bind; let's look up this user.
$mesg = $LDAPconn->search( base => Param("LDAPBaseDN"),
scope => "sub",
filter => Param("LDAPuidattribute") . "=$username",
filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')',
attrs => ['dn'],
);
return (AUTH_LOGINFAILED, undef, "lookup_failure")
@@ -102,7 +102,7 @@ sub authenticate {
# mail attribute for this user.
$mesg = $LDAPconn->search( base => Param("LDAPBaseDN"),
scope => "sub",
filter => Param("LDAPuidattribute") . "=$username",
filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')',
);
my $user_entry = $mesg->shift_entry if !$mesg->code && $mesg->count;
if(!$user_entry || !$user_entry->exists(Param("LDAPmailattribute"))) {

8
mozilla/webtools/bugzilla/defparams.pl
View File

@@ -388,6 +388,14 @@ sub check_loginmethod {
default => 'mail'
},
{
name => 'LDAPfilter',
desc => 'LDAP filter to AND with the <tt>LDAPuidattribute</tt> for ' .
'filtering the list of valid users.',
type => 't',
default => '',
},
{
name => 'loginmethod',
desc => 'The type of login authentication to use: