| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | if ( $this->ldapconn ) { |
| 171 | 171 | $this->printDebug( "Successfully connected", NONSENSITIVE ); |
| 172 | 172 | |
| 173 | | - $searchstring = $this->getSearchString( $this->ldapconn, $username ); |
| | 173 | + $searchstring = $this->getSearchString( $username ); |
| 174 | 174 | |
| 175 | 175 | // If we are using auto authentication, and we got |
| 176 | 176 | // anything back, then the user exists. |
| — | — | @@ -809,10 +809,10 @@ |
| 810 | 810 | $this->printDebug( "Entering validDomain", NONSENSITIVE ); |
| 811 | 811 | |
| 812 | 812 | if ( in_array( $domain, $wgLDAPDomainNames ) || ( $wgLDAPUseLocal && 'local' == $domain ) ) { |
| 813 | | - $this->printDebug( "User is using a valid domain.", NONSENSITIVE ); |
| | 813 | + $this->printDebug( "User is using a valid domain ($domain).", NONSENSITIVE ); |
| 814 | 814 | return true; |
| 815 | 815 | } else { |
| 816 | | - $this->printDebug( "User is not using a valid domain.", NONSENSITIVE ); |
| | 816 | + $this->printDebug( "User is not using a valid domain ($domain).", NONSENSITIVE ); |
| 817 | 817 | return false; |
| 818 | 818 | } |
| 819 | 819 | } |