diff options
| author | Alan Conway <aconway@apache.org> | 2010-01-06 17:02:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-01-06 17:02:32 +0000 |
| commit | 5efdf0be229d6008dadd4d36e115e9b84d292015 (patch) | |
| tree | 9a953fcaec907c93c91fbf87263ac0f5579c2e5b /qpid/cpp | |
| parent | 77ed948d1993e9ee96d9423137038a95ef7b1b1d (diff) | |
| download | qpid-python-5efdf0be229d6008dadd4d36e115e9b84d292015.tar.gz | |
Revert "Make cluster update work out of the box without special authentication options."
This reverts revision 885870
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@896541 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/ClusterSettings.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp index e4aee6730b..6806b3e1dd 100644 --- a/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp +++ b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp @@ -65,9 +65,9 @@ struct ClusterOptions : public Options { ("cluster-url", optValue(settings.url,"URL"), "URL of this broker, advertized to the cluster.\n" "Defaults to a URL listing all the local IP addresses\n") - ("cluster-username", optValue(settings.username, "USER"), "Username for connections between brokers") - ("cluster-password", optValue(settings.password, "PASS"), "Password for connections between brokers") - ("cluster-mechanism", optValue(settings.mechanism, "MECH"), "Authentication mechanism for connections between brokers") + ("cluster-username", optValue(settings.username, ""), "Username for connections between brokers") + ("cluster-password", optValue(settings.password, ""), "Password for connections between brokers") + ("cluster-mechanism", optValue(settings.mechanism, ""), "Authentication mechanism for connections between brokers") #if HAVE_LIBCMAN_H ("cluster-cman", optValue(settings.quorum), "Integrate with Cluster Manager (CMAN) cluster.") #endif diff --git a/qpid/cpp/src/qpid/cluster/ClusterSettings.h b/qpid/cpp/src/qpid/cluster/ClusterSettings.h index d37c7792bf..8e708aa139 100644 --- a/qpid/cpp/src/qpid/cluster/ClusterSettings.h +++ b/qpid/cpp/src/qpid/cluster/ClusterSettings.h @@ -36,7 +36,7 @@ struct ClusterSettings { std::string username, password, mechanism; size_t size; - ClusterSettings() : quorum(false), readMax(10), mechanism("ANONYMOUS"), size(1) + ClusterSettings() : quorum(false), readMax(10), size(1) {} Url getUrl(uint16_t port) const { |