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-stat | |
| 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-stat')
| -rwxr-xr-x | qpid/tools/src/py/qpid-stat | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat index ecbfddf5fb..1780c4a819 100755 --- a/qpid/tools/src/py/qpid-stat +++ b/qpid/tools/src/py/qpid-stat @@ -70,6 +70,7 @@ def OptionsAndArguments(argv): help="Maximum time to wait for broker connection (in seconds)") group1.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.") + group1.add_option("--sasl-service-name", action="store", type="string", help="SASL service name to use") group1.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") group1.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") group1.add_option("--ha-admin", action="store_true", help="Allow connection to a HA backup broker.") @@ -105,6 +106,8 @@ def OptionsAndArguments(argv): if opts.sasl_mechanism: conn_options['sasl_mechanisms'] = opts.sasl_mechanism + if opts.sasl_service_name: + conn_options['sasl_service'] = opts.sasl_service_name if opts.ssl_certificate: conn_options['ssl_certfile'] = opts.ssl_certificate if opts.ssl_key: |