From 2d9f712ce551026f0d5f302aaa0e0b85aea8747c Mon Sep 17 00:00:00 2001 From: Ken Giusti Date: Fri, 2 Oct 2015 19:47:17 +0000 Subject: QPID-6767: add --sasl-service-name option to all QPID tools. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1706480 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/tools/src/py/qpid-tool | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qpid/tools/src/py/qpid-tool') diff --git a/qpid/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool index b4c01677c3..09ca2b8c13 100755 --- a/qpid/tools/src/py/qpid-tool +++ b/qpid/tools/src/py/qpid-tool @@ -717,6 +717,7 @@ def parse_options( argv ): parser = optparse.OptionParser(usage=_usage) parser.add_option("-b", "--broker", action="store", type="string", metavar="
", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:]") parser.add_option("--sasl-mechanism", action="store", type="string", metavar="", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.") + parser.add_option("--sasl-service-name", action="store", type="string", help="SASL service name to use") parser.add_option("--ssl-certificate", action="store", type="string", metavar="", help="SSL certificate for client authentication") @@ -743,6 +744,8 @@ def parse_options( argv ): conn_options['ssl_keyfile'] = opts.ssl_key if opts.sasl_mechanism: conn_options['mechanisms'] = opts.sasl_mechanism + if opts.sasl_service_name: + conn_options['service'] = opts.sasl_service_name return broker_option, conn_options, args[1:] #========================================================= -- cgit v1.2.1