Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB6E81143A for ; Tue, 17 Jun 2014 02:24:22 +0000 (UTC) Received: (qmail 14438 invoked by uid 500); 17 Jun 2014 02:24:22 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 14365 invoked by uid 500); 17 Jun 2014 02:24:22 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 14356 invoked by uid 99); 17 Jun 2014 02:24:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 02:24:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 02:24:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C56AF238899C; Tue, 17 Jun 2014 02:23:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603042 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c Date: Tue, 17 Jun 2014 02:23:58 -0000 To: common-commits@hadoop.apache.org From: jlowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140617022358.C56AF238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlowe Date: Tue Jun 17 02:23:58 2014 New Revision: 1603042 URL: http://svn.apache.org/r1603042 Log: HADOOP-10699. Fix build native library on mac osx. Contributed by Binglin Chang Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1603042&r1=1603041&r2=1603042&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 17 02:23:58 2014 @@ -562,6 +562,9 @@ Release 2.5.0 - UNRELEASED HADOOP-10702. KerberosAuthenticationHandler does not log the principal names correctly. (Benoy Antony via cnauroth) + HADOOP-10699. Fix build native library on mac osx (Binglin Chang via + jlowe) + BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS HADOOP-10520. Extended attributes definition and FileSystem APIs for Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c?rev=1603042&r1=1603041&r2=1603042&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c Tue Jun 17 02:23:58 2014 @@ -73,7 +73,10 @@ Java_org_apache_hadoop_security_JniBased // was successful or not (as long as it was called we need to call // endnetgrent) setnetgrentCalledFlag = 1; -#ifndef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__MACH__) + setnetgrent(cgroup); + { +#else if(setnetgrent(cgroup) == 1) { #endif current = NULL; @@ -90,9 +93,7 @@ Java_org_apache_hadoop_security_JniBased userListSize++; } } -#ifndef __FreeBSD__ } -#endif //-------------------------------------------------- // build return data (java array)