Merge pull request #745 from akrherz/of1282

OF-1282 properly handle setting TLS_CERTIFICATE_VERIFY of false

src/java/org/jivesoftware/openfire/net/SASLAuthentication.java

@@ -331,7 +331,9 @@ public class SASLAuthentication {
                     {
                         // Flag that indicates if certificates of the remote server should be validated.
                         final boolean verify = JiveGlobals.getBooleanProperty( ConnectionSettings.Server.TLS_CERTIFICATE_VERIFY, true );
-                        if ( verify && verifyCertificates( session.getConnection().getPeerCertificates(), saslServer.getAuthorizationID(), true ) )
+                        if ( verify )
+                        {
+                            if ( verifyCertificates( session.getConnection().getPeerCertificates(), saslServer.getAuthorizationID(), true ) )
                             {
                                 ( (LocalIncomingServerSession) session ).tlsAuth();
                             }
@@ -340,6 +342,7 @@ public class SASLAuthentication {
                                 throw new SaslFailureException( Failure.NOT_AUTHORIZED, "Server-to-Server certificate verification failed." );
                             }
                         }
+                    }
 
                     authenticationSuccessful( session, saslServer.getAuthorizationID(), challenge );
                     session.removeSessionData( "SaslServer" );