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 | 7b4b3ada283a92fad3c23c8f76fa47ca9a00b50a (patch) | |
| tree | 0214893cfc6956c0fbb7a37c5f2de2f12ffad62b /cpp/src | |
| parent | 48452ef0b0b8b7d5a5a700aac95a9ed53f95c76e (diff) | |
| download | qpid-python-7b4b3ada283a92fad3c23c8f76fa47ca9a00b50a.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/qpid@896541 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/ClusterPlugin.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/ClusterSettings.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp index e4aee6730b..6806b3e1dd 100644 --- a/cpp/src/qpid/cluster/ClusterPlugin.cpp +++ b/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/cpp/src/qpid/cluster/ClusterSettings.h b/cpp/src/qpid/cluster/ClusterSettings.h index d37c7792bf..8e708aa139 100644 --- a/cpp/src/qpid/cluster/ClusterSettings.h +++ b/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 { |