qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [02/13] qpid-proton git commit: PROTON-1391: Fix passing NULL as a var_arg not working on Solaris
Date Tue, 07 Feb 2017 20:52:12 GMT
PROTON-1391: Fix passing NULL as a var_arg not working on Solaris


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/929f8a5e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/929f8a5e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/929f8a5e

Branch: refs/heads/go1
Commit: 929f8a5e803b01d46f5753390b0709892f6089a9
Parents: 21caa13
Author: aboutros <adel.boutros@murex.com>
Authored: Wed Jan 18 17:09:27 2017 +0100
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Wed Jan 18 19:24:44 2017 -0500

----------------------------------------------------------------------
 proton-c/src/sasl/sasl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/929f8a5e/proton-c/src/sasl/sasl.c
----------------------------------------------------------------------
diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c
index 12b6ad0..55c489d 100644
--- a/proton-c/src/sasl/sasl.c
+++ b/proton-c/src/sasl/sasl.c
@@ -211,7 +211,8 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
       pn_post_frame(transport, SASL_FRAME_TYPE, 0, "DL[B]", SASL_OUTCOME, sasl->outcome);
       pni_emit(transport);
       if (sasl->outcome!=PN_SASL_OK) {
-        pn_do_error(transport, "amqp:unauthorized-access", "Failed to authenticate client
[mech=%s]", transport->sasl->selected_mechanism);
+        pn_do_error(transport, "amqp:unauthorized-access", "Failed to authenticate client
[mech=%s]",
+		    transport->sasl->selected_mechanism ? transport->sasl->selected_mechanism
: "none");
         desired_state = SASL_ERROR;
       }
       break;
@@ -222,7 +223,8 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
       }
       break;
     case SASL_RECVED_OUTCOME_FAIL:
-      pn_do_error(transport, "amqp:unauthorized-access", "Authentication failed [mech=%s]",
transport->sasl->selected_mechanism);
+      pn_do_error(transport, "amqp:unauthorized-access", "Authentication failed [mech=%s]",
+		  transport->sasl->selected_mechanism ? transport->sasl->selected_mechanism
: "none");
       desired_state = SASL_ERROR;
       break;
     case SASL_ERROR:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message