From ea851e0d55bf62d7700fe677ec60b5df759d2516 Mon Sep 17 00:00:00 2001 From: Jonathan Robie Date: Wed, 5 Jan 2011 01:46:00 +0000 Subject: Allow any SASL mechanism to be specified in command line options. Previously used a fixed list of SASL mechanisms. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1055267 13f79535-47bb-0310-9956-ffa450edef68 --- tools/src/py/qpid-queue-stats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/src/py/qpid-queue-stats') diff --git a/tools/src/py/qpid-queue-stats b/tools/src/py/qpid-queue-stats index 808ea50e6b..54f22dfc42 100755 --- a/tools/src/py/qpid-queue-stats +++ b/tools/src/py/qpid-queue-stats @@ -125,7 +125,8 @@ def main(argv=None): p = optparse.OptionParser() p.add_option('--broker-address','-a', default='localhost' , help='broker-addr is in the form: [username/password@] hostname | ip-address [:] \n ex: localhost, 10.1.1.7:10000, broker-host:10000, guest/guest@localhost') p.add_option('--filter','-f' ,default=None ,help='a list of comma separated queue names (regex are accepted) to show') - p.add_option("--sasl-mechanism", action="store", choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"], metavar="", help="SASL mechanism for authentication. SASL automatically picks the most secure available mechanism - use this option to override.") + p.add_option("--sasl-mechanism", action="store", type="string", metavar="", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") + options, arguments = p.parse_args(args=argv) -- cgit v1.2.1