hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a bug in post-commit of not handling ldap_auth_mode 2 properly

Browse Source
This commit is contained in:
hyung-hwan
2015-08-13 02:56:58 +00:00
parent 709d459d09
commit 342ab2170c
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
codepot/etc/post-commit.in
View File

@ -205,8 +205,37 @@ sub get_author_email_ldap
return (-1, undef); return (-1, undef);
} }
my $f_basedn = format_string ($cfg->{ldap_userid_format}, $userid, '');
my $f_filter = '(' . $cfg->{ldap_mail_attribute_name} . '=*)'; my $f_basedn = '';
my $f_filter = '';
if ($cfg->{ldap_auth_mode} == 2)
{
$f_basedn = format_string ($cfg->{ldap_userid_search_base}, $userid, '');
$f_filter = format_string ($cfg->{ldap_userid_search_filter}, $userid, '');
$res = $ldap->search (base => $f_basedn, scope => 'sub', filter => $f_filter);
if ($res->code != LDAP_SUCCESS)
{
$ldap->unbind();
return (-1, undef);
}
my $entry = $res->entry(0); # get the first entry only
if (!defined($entry))
{
$ldap->unbind();
return (0, undef);
}
$f_basedn = $entry->dn ();
}
else
{
$f_basedn = format_string ($cfg->{ldap_userid_format}, $userid, '');
}
$f_filter = '(' . $cfg->{ldap_mail_attribute_name} . '=*)';
$res = $ldap->search (base => $f_basedn, scope => 'sub', filter => $f_filter); $res = $ldap->search (base => $f_basedn, scope => 'sub', filter => $f_filter);
if ($res->code != LDAP_SUCCESS) if ($res->code != LDAP_SUCCESS)