diff options
| author | Kirill Krasnov <krasnovforum@gmail.com> | 2010-01-06 16:45:24 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-07-01 20:01:44 +0200 |
| commit | b7c7128b49e4ee249019c666a711792890352b72 (patch) | |
| tree | 3f3f9d747d806c25488f71f4b5ef7d4fc31e6db8 /inc/auth | |
| parent | 8a52cdf35af9a714e9b330fa0aace6606b071c89 (diff) | |
| download | rpg-b7c7128b49e4ee249019c666a711792890352b72.tar.gz rpg-b7c7128b49e4ee249019c666a711792890352b72.tar.bz2 | |
Fix for Lotus ldap auth FS#1828
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ldap.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php index fc1a7ddb6..e1922ce86 100644 --- a/inc/auth/ldap.class.php +++ b/inc/auth/ldap.class.php @@ -218,7 +218,7 @@ class auth_ldap extends auth_basic { $user_result = array_merge($info,$user_result); //get groups for given user if grouptree is given - if ($this->cnf['grouptree'] && $this->cnf['groupfilter']) { + if ($this->cnf['grouptree'] || $this->cnf['groupfilter']) { $base = $this->_makeFilter($this->cnf['grouptree'], $user_result); $filter = $this->_makeFilter($this->cnf['groupfilter'], $user_result); $sr = $this->_ldapsearch($this->con, $base, $filter, $this->cnf['groupscope'], array($this->cnf['groupkey'])); |