diff options
| author | Alan Conway <aconway@apache.org> | 2011-09-07 17:28:04 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-09-07 17:28:04 +0000 |
| commit | 47c16ba2e19ad4bb149258312f86b4bcd7b04d24 (patch) | |
| tree | bc3bbee7e5438ed2ea4a583e759801956edc1893 /cpp/src/qpid/cluster/Connection.cpp | |
| parent | 12ff1511fa1483c7a3c683e2502e854a02144202 (diff) | |
| download | qpid-python-47c16ba2e19ad4bb149258312f86b4bcd7b04d24.tar.gz | |
Bug 730017, QPID-3475: Cluster authentication ignores cluster-* settings.
When a broker joins a cluster, it should be authenticated authenticate
using the options --cluster-username, --cluster-password and
--cluster-mechanism. The broker was ignoring the settings and joining
the cluster even if an invalid user or password are supplied.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166279 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Connection.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Connection.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 0feb4c19ff..015301573e 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -99,7 +99,9 @@ Connection::Connection(Cluster& c, sys::ConnectionOutputHandler& out, external, isLink, isCatchUp ? ++catchUpId : 0, - isCatchUp), // isCatchUp => shadow + // The first catch-up connection is not considered a shadow + // as it needs to be authenticated. + isCatchUp && self.second > 1), expectProtocolHeader(isLink), mcastFrameHandler(cluster.getMulticast(), self), updateIn(c.getUpdateReceiver()), |