QPID-3438

Remove unnecessary changes to broker.  The cluster code does not really need 
to know that the cnx error was due to auth failure.  Any failure before the cnx
has opened should cause the cnx to be removed from the 'local' map, or a cnx leak
will occur.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1227616 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1 insertions, 10 deletions

diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index 9df49b3ff1..8451f35cb0 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -100,8 +100,7 @@ Connection::Connection(ConnectionOutputHandler* out_,
     errorListener(0),
     objectId(objectId_),
     shadow(shadow_),
-    outboundTracker(*this),
-    securityFailed(false)
+    outboundTracker(*this)
 {
     outboundTracker.wrap(out);
     if (isLink)
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index e4dea33494..742783c052 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -207,13 +207,8 @@ class Connection : public sys::ConnectionInputHandler,
 
     void sent(const framing::AMQFrame& f);
 
-    bool securityFailed;
-
   public:
 
-    bool securityFailure ( ) const { return securityFailed; }
-    void securityFailure ( bool failed ) { securityFailed = failed; }
-
     qmf::org::apache::qpid::broker::Connection* getMgmtObject() { return mgmtObject; }
 };
 
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/cpp/src/qpid/broker/SaslAuthenticator.cpp
index 54692a2781..d7adbd68ab 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.cpp
+++ b/cpp/src/qpid/broker/SaslAuthenticator.cpp
@@ -450,7 +450,6 @@ void CyrusAuthenticator::processAuthenticationStep(int code, const char *challen
 
         client.secure(challenge_str);
     } else {
-        connection.securityFailure ( true );
         std::string uid;
         //save error detail before trying to retrieve username as error in doing so will overwrite it
         std::string errordetail = sasl_errdetail(sasl_conn);
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp
index 88a2806877..f77b6fc748 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/cpp/src/qpid/cluster/Connection.cpp
@@ -742,9 +742,7 @@ void Connection::connectionError(const std::string& msg) {
         cluster.flagError(*this, ERROR_TYPE_CONNECTION, msg);
     }
     else
-    if ( connection->securityFailure() ) {
       cluster.eraseLocal(self);
-    }
 }
 
 void Connection::addQueueListener(const std::string& q, uint32_t listener) {