svn commit: r947838 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java

[boryas]

Author: boryas
Date: Mon May 24 22:24:48 2010
New Revision: 947838

URL: http://svn.apache.org/viewvc?rev=947838&view=rev
Log:
HDFS-1038. In nn_browsedfscontent.jsp fetch delegation token only if security 
is enabled.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=947838&r1=947837&r2=947838&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Mon May 24 22:24:48 2010
@@ -20,6 +20,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    HDFS-1038. In nn_browsedfscontent.jsp fetch delegation token only 
+    if security is enabled. (jnp via boryas)
+
     HDFS-1044. Cannot submit mapreduce job from secure client to 
     unsecure sever (boryas)
 

Modified: 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java?rev=947838&r1=947837&r2=947838&view=diff
==============================================================================
--- 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
 (original)
+++ 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
 Mon May 24 22:24:48 2010
@@ -297,7 +297,7 @@ class NamenodeJspHelper {
 
   static String getDelegationToken(final NameNode nn, final String user
                                    ) throws IOException, InterruptedException {
-    if (user == null) {
+    if (!UserGroupInformation.isSecurityEnabled() ||  user == null) {
       return null;
     }
     UserGroupInformation ugi = UserGroupInformation.createRemoteUser(user);