summaryrefslogtreecommitdiffstats
path: root/etc/inc/auth.inc
diff options
context:
space:
mode:
Diffstat (limited to 'etc/inc/auth.inc')
-rw-r--r--etc/inc/auth.inc15
1 files changed, 13 insertions, 2 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 1dac82e..bf2db0c 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -1,7 +1,7 @@
<?php
/* $Id$ */
/*
- Copyright (C) 2010 Ermal Luçi
+ Copyright (C) 2010 Ermal Lu�i
All rights reserved.
Copyright (C) 2007, 2008 Scott Ullrich <sullrich@gmail.com>
@@ -991,7 +991,18 @@ function ldap_backed($username, $passwd, $authcfg) {
$ldapanon = false;
$ldapauthcont = $authcfg['ldap_authcn'];
$ldapnameattribute = strtolower($authcfg['ldap_attr_user']);
- $ldapfilter = "({$ldapnameattribute}={$username})";
+ $ldapextendedqueryenabled = $authcfg['ldap_extended_enabled'];
+ $ldapextendedquery = $authcfg['ldap_extended_query'];
+ $ldapfilter = "";
+ if(!$ldapextendedqueryenabled)
+ {
+ $ldapfilter = "({$ldapnameattribute}={$username})";
+ }
+ else
+ {
+ $ldapfilter =
+"(&({$ldapnameattribute}={$username})({$ldapextendedquery}))";
+ }
$ldaptype = "";
$ldapver = $authcfg['ldap_protver'];
$ldapname = $authcfg['name'];
OpenPOWER on IntegriCloud