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

gui auth fixes

Browse Source
This commit is contained in:
SJ 2014-01-01 20:55:31 +01:00
parent dce4f29bcd
commit 6d8cfb0e0b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,10 +309,6 @@ class ModelUserAuth extends Model {
public function check_ntlm_auth() { public function check_ntlm_auth() {
$ldap_mail_attr = 'mail';
$ldap_account_objectclass = 'user';
$ldap_distributionlist_attr = 'member';
$ldap_distributionlist_objectclass = 'group';
$ldap_auditor_member_dn = LDAP_AUDITOR_MEMBER_DN; $ldap_auditor_member_dn = LDAP_AUDITOR_MEMBER_DN;
$ldap_admin_member_dn = LDAP_ADMIN_MEMBER_DN; $ldap_admin_member_dn = LDAP_ADMIN_MEMBER_DN;
@ -331,7 +327,7 @@ class ModelUserAuth extends Model {
if($ldap->is_bind_ok()) { if($ldap->is_bind_ok()) {
$query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=$ldap_account_objectclass)(samaccountname=" . $username . "))", array()); $query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=user)(samaccountname=" . $username . "))", array());
if(isset($query->row['dn'])) { if(isset($query->row['dn'])) {
$a = $query->row; $a = $query->row;
@ -344,7 +340,7 @@ class ModelUserAuth extends Model {
return 0; return 0;
} }
$query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=$ldap_account_objectclass)($ldap_mail_attr=$username))(&(objectClass=$ldap_distributionlist_objectclass)($ldap_distributionlist_attr=$username)" . ")(&(objectClass=$ldap_distributionlist_objectclass)($ldap_distributionlist_attr=" . $a['dn'] . ")))", array()); $query = $ldap->query(LDAP_BASE_DN, "(|(&(objectClass=user)(proxyAddresses=smtp:$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);