Return-Path: X-Original-To: apmail-impala-commits-archive@minotaur.apache.org Delivered-To: apmail-impala-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 725BA1904A for ; Tue, 12 Apr 2016 21:18:43 +0000 (UTC) Received: (qmail 76237 invoked by uid 500); 12 Apr 2016 21:18:43 -0000 Delivered-To: apmail-impala-commits-archive@impala.apache.org Received: (qmail 76201 invoked by uid 500); 12 Apr 2016 21:18:43 -0000 Mailing-List: contact commits-help@impala.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@impala.incubator.apache.org Delivered-To: mailing list commits@impala.incubator.apache.org Received: (qmail 76183 invoked by uid 99); 12 Apr 2016 21:18:43 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Apr 2016 21:18:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 01900C050C for ; Tue, 12 Apr 2016 21:18:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.996] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ZlKON8KFAWgW for ; Tue, 12 Apr 2016 21:18:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id AF28E60F9B for ; Tue, 12 Apr 2016 21:18:37 +0000 (UTC) Received: (qmail 74355 invoked by uid 99); 12 Apr 2016 21:18:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Apr 2016 21:18:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78EA7E022F; Tue, 12 Apr 2016 21:18:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: tarmstrong@apache.org To: commits@impala.incubator.apache.org Date: Tue, 12 Apr 2016 21:19:05 -0000 Message-Id: In-Reply-To: <412ef27135be438f9dae79ef8cd34525@git.apache.org> References: <412ef27135be438f9dae79ef8cd34525@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] incubator-impala git commit: IMPALA-2645: Set mechUsing only on success IMPALA-2645: Set mechUsing only on success Better to check success status from sasl_client_start() before using returned structure with auth mechanism. According to the API documentation, its value is guaranteed only after success (no error, or SASL_CONTINUE). Change-Id: I71e5bb754866003e2a282ce3eeb8d4e6eac0573d Reviewed-on: http://gerrit.cloudera.org:8080/2687 Tested-by: Internal Jenkins Reviewed-by: Henry Robinson Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/7dd4998b Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/7dd4998b Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/7dd4998b Branch: refs/heads/master Commit: 7dd4998b4fc142425080fa1cce07dcf36df24c1d Parents: 5703f4e Author: František Dvořák Authored: Thu Mar 31 23:43:37 2016 +0200 Committer: Henry Robinson Committed: Tue Apr 5 22:26:16 2016 +0000 ---------------------------------------------------------------------- be/src/transport/TSasl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/7dd4998b/be/src/transport/TSasl.cpp ---------------------------------------------------------------------- diff --git a/be/src/transport/TSasl.cpp b/be/src/transport/TSasl.cpp index 31e1e1a..3108dff 100644 --- a/be/src/transport/TSasl.cpp +++ b/be/src/transport/TSasl.cpp @@ -148,7 +148,9 @@ uint8_t* TSaslClient::evaluateChallengeOrResponse( &outlen, /* filled in on success */ (const char**)&mechUsing); clientStarted = true; - chosenMech = mechUsing; + if (result == SASL_OK || result == SASL_CONTINUE) { + chosenMech = mechUsing; + } } else { if (len > 0) { result=sasl_client_step(conn, /* our context */