You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2017/07/17 20:56:45 UTC
[1/2] qpid-dispatch git commit: DISPATCH-737: Take username and
password also from the URL
Repository: qpid-dispatch
Updated Branches:
refs/heads/master ccd6b0880 -> 40f1005c4
DISPATCH-737: Take username and password also from the URL
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/e0bbd3e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/e0bbd3e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/e0bbd3e2
Branch: refs/heads/master
Commit: e0bbd3e2b739f8f813f7cd57a0482d8da9b94be1
Parents: ccd6b08
Author: Jakub Scholz <ww...@scholzj.com>
Authored: Mon Jul 17 22:26:30 2017 +0200
Committer: Jakub Scholz <ww...@scholzj.com>
Committed: Mon Jul 17 22:26:30 2017 +0200
----------------------------------------------------------------------
python/qpid_dispatch_internal/tools/command.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e0bbd3e2/python/qpid_dispatch_internal/tools/command.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/tools/command.py b/python/qpid_dispatch_internal/tools/command.py
index ff24123..22415ee 100644
--- a/python/qpid_dispatch_internal/tools/command.py
+++ b/python/qpid_dispatch_internal/tools/command.py
@@ -132,7 +132,9 @@ def opts_url(opts):
return url
def opts_sasl(opts):
- mechs, user, password, sasl_password_file = opts.sasl_mechanisms, opts.sasl_username, opts.sasl_password, opts.sasl_password_file
+ url = Url(opts.bus)
+ mechs, user, password, sasl_password_file = opts.sasl_mechanisms, (opts.sasl_username or url.username), (opts.sasl_password or url.password), opts.sasl_password_file
+
if not (mechs or user or password or sasl_password_file):
return None
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-dispatch git commit: DISPATCH-737: Empty string as
allowed_mechs is interpreted as no mechs allowed. Use None instead and Proton
will select the best appropriatte mechanism
Posted by gm...@apache.org.
DISPATCH-737: Empty string as allowed_mechs is interpreted as no mechs allowed. Use None instead and Proton will select the best appropriatte mechanism
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/40f1005c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/40f1005c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/40f1005c
Branch: refs/heads/master
Commit: 40f1005c4aa0b4c9b74fbde0d9ad65050b8328d7
Parents: e0bbd3e
Author: Jakub Scholz <ww...@scholzj.com>
Authored: Mon Jul 17 22:27:29 2017 +0200
Committer: Jakub Scholz <ww...@scholzj.com>
Committed: Mon Jul 17 22:27:29 2017 +0200
----------------------------------------------------------------------
python/qpid_dispatch/management/client.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/40f1005c/python/qpid_dispatch/management/client.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch/management/client.py b/python/qpid_dispatch/management/client.py
index f50cf53..a449e33 100644
--- a/python/qpid_dispatch/management/client.py
+++ b/python/qpid_dispatch/management/client.py
@@ -96,7 +96,7 @@ class Node(object):
timeout=timeout,
ssl_domain=ssl_domain,
sasl_enabled=sasl_enabled,
- allowed_mechs=str(sasl.mechs) if sasl else None,
+ allowed_mechs=str(sasl.mechs) if sasl and sasl.mechs != None else None,
user=str(sasl.user) if sasl else None,
password=str(sasl.password) if sasl else None)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org