From patchwork Fri Jul 22 19:13:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcus Sorensen X-Patchwork-Id: 1000792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6MJDFNT029294 for ; Fri, 22 Jul 2011 19:13:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754883Ab1GVTNO (ORCPT ); Fri, 22 Jul 2011 15:13:14 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:37100 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754859Ab1GVTNN convert rfc822-to-8bit (ORCPT ); Fri, 22 Jul 2011 15:13:13 -0400 Received: by wyg8 with SMTP id 8so1693542wyg.19 for ; Fri, 22 Jul 2011 12:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; bh=h1u5YfnhnuXrLRlIadasV/9GYyVxXqpux4DixLM6anA=; b=Z4rfec9vgfnd6gTCDF34xQewbjNsFHZLMANrWoAuslT6+Ca6hQAalH1KVrjW6pmI9J h7T/WLgoXksVbT+TRafGxwSC4ghZXr+V519nsmdhQd6K6pz5EFTuPjDd923y5sxCtQsJ 0rj0ObkdB+4g1VX8FB0KN/CrmmD5yIGaGCtsg= MIME-Version: 1.0 Received: by 10.216.169.16 with SMTP id m16mr2111136wel.83.1311361992775; Fri, 22 Jul 2011 12:13:12 -0700 (PDT) Received: by 10.216.183.71 with HTTP; Fri, 22 Jul 2011 12:13:12 -0700 (PDT) In-Reply-To: <1311356967-1797-1-git-send-email-shadowsor@gmail.com> References: <1311356967-1797-1-git-send-email-shadowsor@gmail.com> Date: Fri, 22 Jul 2011 13:13:12 -0600 Message-ID: Subject: [PATCH] Fix compile error when using nss libs: From: Marcus Sorensen To: ceph-devel@vger.kernel.org Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Jul 2011 19:13:16 +0000 (UTC) auth/Crypto.cc:218: error: expected primary-expression before ‘}’ token auth/Crypto.cc:218: error: expected ‘;’ before ‘}’ token Perhaps something more is missing here but this gets things going... apparently not used much? ---  src/auth/Crypto.cc |    1 +  1 files changed, 1 insertions(+), 0 deletions(-)  #else -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index 7251d09..ad256bb 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -215,6 +215,7 @@ static void nss_aes_operation(CK_ATTRIBUTE_TYPE op, const bufferptr& secret,  err_slot:   PK11_FreeSlot(slot);  err: +  ;  }