1
0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 11:42:23 -05:00

fix LDAPV3 test

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@262 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2008-12-26 14:02:26 +00:00
parent 7a659b7e5e
commit 36fdbc096c

View File

@ -167,7 +167,7 @@ public class LdapConnection extends AbstractConnection {
/** /**
* Current LDAP version (used for String encoding) * Current LDAP version (used for String encoding)
*/ */
final int ldapVersion = LDAP_VERSION3; int ldapVersion = LDAP_VERSION3;
// Initialize the streams and start the thread // Initialize the streams and start the thread
public LdapConnection(Socket clientSocket) { public LdapConnection(Socket clientSocket) {
@ -293,9 +293,9 @@ public class LdapConnection extends AbstractConnection {
if (requestOperation == LDAP_REQ_BIND) { if (requestOperation == LDAP_REQ_BIND) {
reqBer.parseSeq(null); reqBer.parseSeq(null);
int ldapVersion = reqBer.parseInt(); ldapVersion = reqBer.parseInt();
String userName = reqBer.parseString(ldapVersion == LDAP_VERSION3); String userName = reqBer.parseString(isLdapV3());
String password = reqBer.parseStringWithTag(Ber.ASN_CONTEXT, ldapVersion == LDAP_VERSION3, null); String password = reqBer.parseStringWithTag(Ber.ASN_CONTEXT, isLdapV3(), null);
if (userName.length() > 0 && password.length() > 0) { if (userName.length() > 0 && password.length() > 0) {
DavGatewayTray.debug("LDAP_REQ_BIND " + currentMessageId + " " + userName); DavGatewayTray.debug("LDAP_REQ_BIND " + currentMessageId + " " + userName);