From patchwork Wed Nov 13 21:53:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 291055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "userp1040.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C9A072C009D for ; Thu, 14 Nov 2013 08:54:16 +1100 (EST) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id rADLsD2V025987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Nov 2013 21:54:14 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rADLsCwv020687 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 13 Nov 2013 21:54:13 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1VgiO4-0006tG-PT; Wed, 13 Nov 2013 13:54:12 -0800 Received: from ucsinet21.oracle.com ([156.151.31.93]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1VgiNl-0006py-Bp for fedfs-utils-devel@oss.oracle.com; Wed, 13 Nov 2013 13:53:53 -0800 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rADLrqqp010754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Nov 2013 21:53:53 GMT Received: from mail-gg0-f176.google.com (mail-gg0-f176.google.com [209.85.161.176]) by aserp1030.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id rADLrp0p010293 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Wed, 13 Nov 2013 21:53:52 GMT Received: by mail-gg0-f176.google.com with SMTP id u4so450860ggn.7 for ; Wed, 13 Nov 2013 13:53:51 -0800 (PST) X-Received: by 10.236.16.6 with SMTP id g6mr13918yhg.250.1384379631403; Wed, 13 Nov 2013 13:53:51 -0800 (PST) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by mx.google.com with ESMTPSA id r1sm59749059yhf.17.2013.11.13.13.53.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Nov 2013 13:53:51 -0800 (PST) To: fedfs-utils-devel@oss.oracle.com From: Chuck Lever Date: Wed, 13 Nov 2013 16:53:50 -0500 Message-ID: <20131113215350.23593.49769.stgit@seurat.1015granger.net> In-Reply-To: <20131113214635.23593.36381.stgit@seurat.1015granger.net> References: <20131113214635.23593.36381.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.161.176 ct-class=R6 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=68 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=876 X-SPF-Info: PASS::mail-gg0-f176.google.com X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=MJJZxqpl c=1 sm=1 tr=0 a=HILk0Rxo/DrxjUftkGmnZA==:117 a=dzsqy3y4QnMA:10 a=pAR56IaB408A:10 a=dPGociXpb70A:10 a=IkcTkHD0fZMA:10 a=xqWC_Br6kY4A:10 a=yPCof4ZbAAAA:8 a=Lb1rMZzfAAAA:8 a=1XWaLZrsAAAA:8 a=pCi-EsMKzdsA:10 a=5ul07Jg1xY0rb 1D2ui8A:9 a=QEXdDO2ut3YA:10 a=7DSvI1NPTFQA:10 X-Sendmail-CT-Classification: not spam X-Sendmail-CT-RefID: str=0001.0A090204.5283F4F0.004C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 Subject: [fedfs-utils] [PATCH 2/8] libnsdb: Fix nsdb_ping_contexts_s() X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] Commit a9c62419 added a switch() in a for() loop, which changes the semantics of "break;". Signed-off-by: Chuck Lever --- src/libnsdb/fileserver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c index d3f7560..9c80521 100644 --- a/src/libnsdb/fileserver.c +++ b/src/libnsdb/fileserver.c @@ -1757,17 +1757,18 @@ nsdb_ping_contexts_s(nsdb_t host, char **contexts, unsigned int *ldap_err) switch (retval) { case FEDFS_OK: free(dn); - break; + goto out; case FEDFS_ERR_NSDB_LDAP_VAL: if (ldap_result == LDAP_CONFIDENTIALITY_REQUIRED) retval = FEDFS_ERR_NSDB_AUTH; else *ldap_err = ldap_result; - break; + goto out; default: retval = FEDFS_ERR_NSDB_NONCE; } } +out: return retval; }