Author: jlowe Date: Tue Jun 17 02:25:13 2014 New Revision: 1603043 URL: http://svn.apache.org/r1603043 Log: svn merge -c 1603042 FIXES: HADOOP-10699. Fix build native library on mac osx. Contributed by Binglin Chang
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1603043&r1=1603042&r2=1603043&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 17 02:25:13 2014 @@ -225,6 +225,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/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c?rev=1603043&r1=1603042&r2=1603043&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c Tue Jun 17 02:25:13 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)