diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-10-23 16:40:40 +0200 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-10-23 16:40:40 +0200 |
| commit | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (patch) | |
| tree | adcea7789395cf752416306f0ed6952c7f702ef8 /inc/auth | |
| parent | e3626db54846ba20cefbc1a9e2d8e29c40137067 (diff) | |
| parent | 06ce34e4a80b6875db82190eb7abfb97bfd801b8 (diff) | |
| download | rpg-bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a.tar.gz rpg-bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ldap.class.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php index 5cc186ce2..7f1eec187 100644 --- a/inc/auth/ldap.class.php +++ b/inc/auth/ldap.class.php @@ -222,12 +222,12 @@ class auth_ldap extends auth_basic { $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'])); + if($this->cnf['debug']){ + msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__); + msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__); + } if(!$sr){ msg("LDAP: Reading group memberships failed",-1); - if($this->cnf['debug']){ - msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__); - msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__); - } return false; } $result = ldap_get_entries($this->con, $sr); |