From f647d801b590b7b0fecb3170ef1a7417b26c4e41 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 03 Nov 2010 10:20:57 +0000
Subject: [PATCH] Fix defect OpenDJ-6 : Return protocol error when LDAPv2 is disabled and connection is done with LDAPv2 Issue #OPENDJ-6 - Wrong error returned when LDAPv2 is disabled

---
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java |    2 +-
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index f544e1c..b428001 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -1863,7 +1863,7 @@
       {
         BindResponseProtocolOp responseOp =
             new BindResponseProtocolOp(
-                LDAPResultCode.INAPPROPRIATE_AUTHENTICATION,
+                LDAPResultCode.PROTOCOL_ERROR,
                 ERR_LDAPV2_CLIENTS_NOT_ALLOWED.get());
         sendLDAPMessage(new LDAPMessage(message.getMessageID(),
             responseOp));
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 029c6a7..23677ed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -98,7 +98,7 @@
       message = r.readMessage();
       BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
       assertEquals(bindResponse.getResultCode(),
-                   LDAPResultCode.INAPPROPRIATE_AUTHENTICATION);
+                   LDAPResultCode.PROTOCOL_ERROR);
     }
     finally
     {

--
Gitblit v1.10.0