bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-26 09:40:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

ntlm_auth() fix

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2017-06-25 12:38:28 +00:00
parent 89e612b128
commit 730e166868
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webui/model/user/auth.php
View File

@ -283,7 +283,7 @@ class ModelUserAuth extends Model {
foreach($e as $a) { foreach($e as $a) {
if(LOG_LEVEL >= DEBUG) { syslog(LOG_INFO, "checking ldap entry dn: " . $a['dn'] . ", cn: " . $a['cn']); } if(LOG_LEVEL >= DEBUG) { syslog(LOG_INFO, "checking ldap entry dn: " . $a['dn'] . ", cn: " . $a['cn']); }
foreach (array("mail", "mailalternateaddress", "proxyaddresses", "zimbraMailForwardingAddress", "member", "memberOfGroup") as $mailattr) { foreach (array("mail", "mailalternateaddress", "proxyaddresses", "zimbraMailForwardingAddress", "member", "memberOfGroup", "othermailbox") as $mailattr) {
if(isset($a[$mailattr])) { if(isset($a[$mailattr])) {
if(is_array($a[$mailattr])) { if(is_array($a[$mailattr])) {
@ -460,11 +460,16 @@ class ModelUserAuth extends Model {
} }
$ldap_mail_attr = LDAP_MAIL_ATTR; $ldap_mail_attr = LDAP_MAIL_ATTR;
if(LDAP_MAIL_ATTR == 'proxyAddresses') { $ldap_mail_attr = 'proxyAddresses=smtp:'; }
if(LDAP_MAIL_ATTR == 'proxyAddresses') {
$ldap_mail_attr = 'proxyAddresses=smtp:';
}
else {
$ldap_mail_attr .= '=';
}
$query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=user)(" . $ldap_mail_attr . "$username))(&(objectClass=group)(member=$username))(&(objectClass=group)(member=" . stripslashes($a['dn']) . ")))", array()); $query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=user)(" . $ldap_mail_attr . "$username))(&(objectClass=group)(member=$username))(&(objectClass=group)(member=" . stripslashes($a['dn']) . ")))", array());
$emails = $this->get_email_array_from_ldap_attr($query->rows); $emails = $this->get_email_array_from_ldap_attr($query->rows);
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails); $extra_emails = $this->model_user_user->get_email_addresses_from_groups($emails);