svn commit: r1175658 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt src/contrib/fuse-dfs/build.xml src/contrib/fuse-dfs/src/fuse_connect.c

[ma...@apache.org]

Author: mattf
Date: Mon Sep 26 04:17:21 2011
New Revision: 1175658

URL: http://svn.apache.org/viewvc?rev=1175658&view=rev
Log:
HDFS-2325. Fuse-DFS fails to build on Hadoop 20.203.0. Contributed by Kihwal Lee.

Modified:
    hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
    hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/build.xml
    hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/src/fuse_connect.c

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1175658&r1=1175657&r2=1175658&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Mon Sep 26 04:17:21 2011
@@ -47,6 +47,9 @@ Release 0.20.205.0 - 2011.09.12
 
   BUG FIXES
 
+    HDFS-2325. Fuse-DFS fails to build on Hadoop 20.203.0
+    (Kihwal Lee via mattf)
+
     HDFS-2342. add Jersey libraries to ivy.xml files in contrib, to fix
     TestSleepJob and TestHdfsProxy. (Tsz Wo (Nicholas), SZE via mattf)
 

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/build.xml?rev=1175658&r1=1175657&r2=1175658&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/build.xml Mon Sep 26 04:17:21 2011
@@ -32,13 +32,20 @@
 
 
   <target name="check-libhdfs-exists" if="fusedfs">
-  <property name="libhdfs.lib" value="${hadoop.root}/build/libhdfs/libhdfs.so"/>
+    <patternset id="empty.exclude.list.id" />
+        <exec executable="sed" inputstring="${os.name}"
+            outputproperty="nonspace.os">
+          <arg value="s/ /_/g"/>
+        </exec>
+    <property name="build.platform" 
+            value="${nonspace.os}-${os.arch}-${sun.arch.data.model}"/>
+    <property name="libhdfs.lib" value="${hadoop.root}/build/c++/${build.platform}/lib/libhdfs.so"/>
         <available file="${libhdfs.lib}" property="libhdfs-exists"/>
     <fail message="libhdfs.so does not exist: ${libhdfs.lib}. Please check flags -Dlibhdfs=1 -Dfusedfs=1 are set or first try ant compile-libhdfs -Dlibhdfs=1">
          <condition>
             <not><isset property="libhdfs-exists"/></not>
           </condition>
-   </fail>
+     </fail>
    </target>
 
   <!-- override compile target !-->

Modified: hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/src/fuse_connect.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/src/fuse_connect.c?rev=1175658&r1=1175657&r2=1175658&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/src/fuse_connect.c (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/contrib/fuse-dfs/src/fuse_connect.c Mon Sep 26 04:17:21 2011
@@ -35,10 +35,7 @@ hdfsFS doConnectAsUser(const char *hostn
   char *user = getUsername(uid);
   if (NULL == user)
     return NULL;
-  int numgroups = 0;
-  char **groups = getGroups(uid, &numgroups);
-  hdfsFS fs = hdfsConnectAsUser(hostname, port, user, (const char **)groups, numgroups);
-  freeGroups(groups, numgroups);
+  hdfsFS fs = hdfsConnectAsUser(hostname, port, user);
   if (user) 
     free(user);
   return fs;