summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2011-03-04 19:16:53 +0000
committerMichael Goulish <mgoulish@apache.org>2011-03-04 19:16:53 +0000
commit8d66c5961f55b951dca1ff9be69b9bd3d96fae51 (patch)
tree09a66022d9333d16fa114ca4c99e26ca6d8e1192
parent607474feb4ef3a46cd5a3f165de019289ccf351d (diff)
downloadqpid-python-8d66c5961f55b951dca1ff9be69b9bd3d96fae51.tar.gz
QPID-3117
Fix misleading --help info on --sasl-config flag. Its argument is not a file, it's a directory. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1078107 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index 695943854d..65e712d608 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -152,7 +152,7 @@ Broker::Options::Options(const std::string& name) :
("tcp-nodelay", optValue(tcpNoDelay), "Set TCP_NODELAY on TCP connections")
("require-encryption", optValue(requireEncrypted), "Only accept connections that are encrypted")
("known-hosts-url", optValue(knownHosts, "URL or 'none'"), "URL to send as 'known-hosts' to clients ('none' implies empty list)")
- ("sasl-config", optValue(saslConfigPath, "FILE"), "gets sasl config from nonstandard location")
+ ("sasl-config", optValue(saslConfigPath, "DIR"), "gets sasl config info from nonstandard location")
("max-session-rate", optValue(maxSessionRate, "MESSAGES/S"), "Sets the maximum message rate per session (0=unlimited)")
("async-queue-events", optValue(asyncQueueEvents, "yes|no"), "Set Queue Events async, used for services like replication")
("default-flow-stop-threshold", optValue(queueFlowStopRatio, "%MESSAGES"), "Queue capacity level at which flow control is activated.")