PROTON-916: Avoid unnecessary heap allocation
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/638c18b3 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/638c18b3 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/638c18b3 Branch: refs/heads/PROTON-781-ruby-reactor-apis Commit: 638c18b33d4dd8f10692b975f522053a2ed4f980 Parents: 5b611b7 Author: Andrew Stitcher <[email protected]> Authored: Wed Jun 17 18:17:31 2015 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Wed Jun 17 18:28:39 2015 -0400 ---------------------------------------------------------------------- proton-c/src/sasl/cyrus_sasl.c | 2 +- proton-c/src/sasl/sasl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/638c18b3/proton-c/src/sasl/cyrus_sasl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/cyrus_sasl.c b/proton-c/src/sasl/cyrus_sasl.c index b42ffa5..c84d0af 100644 --- a/proton-c/src/sasl/cyrus_sasl.c +++ b/proton-c/src/sasl/cyrus_sasl.c @@ -245,7 +245,7 @@ bool pni_init_server(pn_transport_t* transport) if (result!=SASL_OK) break; } - result = sasl_server_init(NULL, sasl->config_name); + result = sasl_server_init(NULL, sasl->config_name ? sasl->config_name : "proton-server"); if (result!=SASL_OK) break; result = sasl_server_new(amqp_service, NULL, NULL, NULL, NULL, NULL, 0, &cyrus_conn); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/638c18b3/proton-c/src/sasl/sasl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c index 47084ee..2e6be06 100644 --- a/proton-c/src/sasl/sasl.c +++ b/proton-c/src/sasl/sasl.c @@ -366,7 +366,7 @@ pn_sasl_t *pn_sasl(pn_transport_t *transport) sasl->included_mechanisms = NULL; sasl->username = NULL; sasl->password = NULL; - sasl->config_name = pn_strdup(sasl->client ? "proton-client" : "proton-server"); + sasl->config_name = NULL; sasl->config_dir = sasl_config_path ? pn_strdup(sasl_config_path) : NULL; sasl->remote_fqdn = NULL; sasl->external_auth = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
