diff options
| author | Ken Giusti <kgiusti@apache.org> | 2015-10-02 19:47:17 +0000 |
|---|---|---|
| committer | Ken Giusti <kgiusti@apache.org> | 2015-10-02 19:47:17 +0000 |
| commit | 2d9f712ce551026f0d5f302aaa0e0b85aea8747c (patch) | |
| tree | 8427119ed542cc03c06c69e15185bcd2bbdcd091 /qpid/tools/src/py/qpid-tool | |
| parent | 541f2bb32a936033f959cd1891c902cc6219a77a (diff) | |
| download | qpid-python-2d9f712ce551026f0d5f302aaa0e0b85aea8747c.tar.gz | |
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
Diffstat (limited to 'qpid/tools/src/py/qpid-tool')
| -rwxr-xr-x | qpid/tools/src/py/qpid-tool | 3 |
1 files changed, 3 insertions, 0 deletions
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="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]") parser.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", 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="<path>", 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:] #========================================================= |