From 1dfff197eadcf24823d7915e6eead2a850f679f9 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 14 Feb 2012 16:09:28 +0000
Subject: [PATCH] Fix OPENDJ-420: Rare SSLExceptions while handling LDAPS connections and big LDAP searches
---
opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 2c9a519..e459de7 100644
--- a/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -163,18 +164,7 @@
(SASLContext) clientConn.getSASLAuthStateInfo();
if(saslContext == null) {
try {
- //If the connection is secure already (i.e., TLS), then make the
- //receive buffers sizes match.
- if(clientConn.isSecure()) {
- HashMap<String, String>secProps =
- new HashMap<String,String>(saslProps);
- int maxBuf = clientConn.getAppBufferSize();
- secProps.put(Sasl.MAX_BUFFER, Integer.toString(maxBuf));
- saslContext = SASLContext.createSASLContext(secProps,
- serverFQDN, SASL_MECHANISM_DIGEST_MD5,
- identityMapper);
- } else
- saslContext = SASLContext.createSASLContext(saslProps, serverFQDN,
+ saslContext = SASLContext.createSASLContext(saslProps, serverFQDN,
SASL_MECHANISM_DIGEST_MD5, identityMapper);
} catch (SaslException ex) {
if (debugEnabled()) {
--
Gitblit v1.10.0