diff options
| author | Jonathan Robie <jonathan@apache.org> | 2011-01-05 01:46:00 +0000 |
|---|---|---|
| committer | Jonathan Robie <jonathan@apache.org> | 2011-01-05 01:46:00 +0000 |
| commit | ea851e0d55bf62d7700fe677ec60b5df759d2516 (patch) | |
| tree | 09b20d8f28171a4328d4ebb19937610350170a78 /tools/src/py/qpid-route | |
| parent | f84dd0c67c4902f969e993be68770744d2bc9f3c (diff) | |
| download | qpid-python-ea851e0d55bf62d7700fe677ec60b5df759d2516.tar.gz | |
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
Diffstat (limited to 'tools/src/py/qpid-route')
| -rwxr-xr-x | tools/src/py/qpid-route | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/src/py/qpid-route b/tools/src/py/qpid-route index 0e9d405643..2a0d3cef59 100755 --- a/tools/src/py/qpid-route +++ b/tools/src/py/qpid-route @@ -98,7 +98,7 @@ def OptionsAndArguments(argv): parser.add_option("--ack", action="store", type="int", metavar="<n>", help="Acknowledge transfers over the bridge in batches of N") parser.add_option("-t", "--transport", action="store", type="string", default="tcp", metavar="<transport>", help="Transport to use for links, defaults to tcp") - parser.add_option("--sasl-mechanism", action="store", choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"], metavar="<mech>", help="SASL mechanism for authentication. Used when the client connects to the destination broker (not for authentication between the source and destination brokers - that is specified using the [mechanisms] argument to 'add route'). SASL automatically picks the most secure available mechanism - use this option to override.") + parser.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). Used when the client connects to the destination broker (not for authentication between the source and destination brokers - that is specified using the [mechanisms] argument to 'add route'). SASL automatically picks the most secure available mechanism - use this option to override.") opts, encArgs = parser.parse_args(args=argv) |