opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -153,7 +153,7 @@ } MessageBuilder unavailableReason = new MessageBuilder(); if (! tlsCapableConnection.isStartTLSAvailable(unavailableReason)) if (! tlsCapableConnection.prepareTLS(unavailableReason)) { operation.setResultCode(ResultCode.UNAVAILABLE); operation.setErrorMessage(unavailableReason); opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
@@ -40,10 +40,10 @@ public interface TLSCapableConnection { /** * Indicates whether TLS protection is actually available for the underlying * client connection. If there is any reason that TLS protection cannot be * enabled on this client connection, then it should be appended to the * provided buffer. * Prepares this connection for using TLS and returns whether TLS protection * is actually available for the underlying client connection. If there is any * reason that TLS protection cannot be enabled on this client connection, * then it should be appended to the provided buffer. * * @param unavailableReason The buffer used to hold the reason that TLS is * not available on the underlying client @@ -52,6 +52,6 @@ * @return <CODE>true</CODE> if TLS is available on the underlying client * connection, or <CODE>false</CODE> if it is not. */ public boolean isStartTLSAvailable(MessageBuilder unavailableReason); public boolean prepareTLS(MessageBuilder unavailableReason); } opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -2496,20 +2496,11 @@ /** * Indicates whether TLS protection is actually available for the * underlying client connection. If there is any reason that TLS * protection cannot be enabled on this client connection, then it * should be appended to the provided buffer. * * @param unavailableReason * The buffer used to hold the reason that TLS is not * available on the underlying client connection. * @return <CODE>true</CODE> if TLS is available on the underlying * client connection, or <CODE>false</CODE> if it is not. * {@inheritDoc} */ public boolean isStartTLSAvailable(MessageBuilder unavailableReason) public boolean prepareTLS(MessageBuilder unavailableReason) { if (isSecure() && activeProvider.getName().equals("TLS")) if (isSecure() && "TLS".equals(activeProvider.getName())) { unavailableReason.append(ERR_LDAP_TLS_EXISTING_SECURITY_PROVIDER .get(activeProvider.getName()));