Repository: qpid-dispatch Updated Branches: refs/heads/master fac17aa75 -> 69bbe489c
DISPATCH-281 - Added call to pn_connection_set_hostname to set the hostname on the pn_connection Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/69bbe489 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/69bbe489 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/69bbe489 Branch: refs/heads/master Commit: 69bbe489c7c2e0f3812f906afa240a45e3d35d60 Parents: fac17aa Author: Ganesh Murthy <[email protected]> Authored: Mon Apr 18 15:03:03 2016 -0400 Committer: Ganesh Murthy <[email protected]> Committed: Mon Apr 18 15:03:03 2016 -0400 ---------------------------------------------------------------------- src/server.c | 5 +++++ tests/system_tests_sasl_plain.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/69bbe489/src/server.c ---------------------------------------------------------------------- diff --git a/src/server.c b/src/server.c index 16035d5..785bb31 100644 --- a/src/server.c +++ b/src/server.c @@ -1111,6 +1111,11 @@ static void cxtr_try_open(void *context) return; } + // + // Set the hostname on the pn_connection. This hostname will be used by proton as the hostname in the open frame. + // + pn_connection_set_hostname(ctx->pn_conn, config->host); + // Set the sasl user name and password on the proton connection object. This has to be done before the call to qdpn_connector_transport() which // binds the transport to the connection if(config->sasl_username) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/69bbe489/tests/system_tests_sasl_plain.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py index ac0d6a4..d7dfddc 100644 --- a/tests/system_tests_sasl_plain.py +++ b/tests/system_tests_sasl_plain.py @@ -79,7 +79,7 @@ sql_select: dummy select router('X', [ ('listener', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, - 'saslMechanisms':'PLAIN DIGEST-MD5', 'authenticatePeer': 'yes'}), + 'saslMechanisms':'PLAIN', 'authenticatePeer': 'yes'}), # This unauthenticated listener is for qdstat to connect to it. ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'authenticatePeer': 'no'}), @@ -91,7 +91,7 @@ sql_select: dummy select router('Y', [ ('connector', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, # Provide a sasl user name and password to connect to QDR.X - 'saslMechanisms': 'PLAIN DIGEST-MD5', 'saslUsername': '[email protected]', 'saslPassword': 'password'}), + 'saslMechanisms': 'PLAIN', 'saslUsername': '[email protected]', 'saslPassword': 'password'}), ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Y'}), ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), ]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
