hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject svn commit: r1588099 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src: main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
Date Wed, 16 Apr 2014 23:16:37 GMT
Author: cnauroth
Date: Wed Apr 16 23:16:36 2014
New Revision: 1588099

URL: http://svn.apache.org/r1588099
Log:
HADOOP-10499. Merging change r1588098 from trunk to branch-2.

Modified:
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java?rev=1588099&r1=1588098&r2=1588099&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
Wed Apr 16 23:16:36 2014
@@ -626,7 +626,7 @@ public class JspHelper {
       if (doAsUserFromQuery != null) {
         // create and attempt to authorize a proxy user
         ugi = UserGroupInformation.createProxyUser(doAsUserFromQuery, ugi);
-        ProxyUsers.authorize(ugi, getRemoteAddr(request), conf);
+        ProxyUsers.authorize(ugi, getRemoteAddr(request));
       }
     }
     

Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java?rev=1588099&r1=1588098&r2=1588099&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java
Wed Apr 16 23:16:36 2014
@@ -179,14 +179,14 @@ public class TestRefreshUserMappings {
     
     // check before
     try {
-      ProxyUsers.authorize(ugi1, "127.0.0.1", config);
+      ProxyUsers.authorize(ugi1, "127.0.0.1");
       fail("first auth for " + ugi1.getShortUserName() + " should've failed ");
     } catch (AuthorizationException e) {
       // expected
       System.err.println("auth for " + ugi1.getUserName() + " failed");
     }
     try {
-      ProxyUsers.authorize(ugi2, "127.0.0.1", config);
+      ProxyUsers.authorize(ugi2, "127.0.0.1");
       System.err.println("auth for " + ugi2.getUserName() + " succeeded");
       // expected
     } catch (AuthorizationException e) {
@@ -204,14 +204,14 @@ public class TestRefreshUserMappings {
     admin.run(args);
     
     try {
-      ProxyUsers.authorize(ugi2, "127.0.0.1", config);
+      ProxyUsers.authorize(ugi2, "127.0.0.1");
       fail("second auth for " + ugi2.getShortUserName() + " should've failed ");
     } catch (AuthorizationException e) {
       // expected
       System.err.println("auth for " + ugi2.getUserName() + " failed");
     }
     try {
-      ProxyUsers.authorize(ugi1, "127.0.0.1", config);
+      ProxyUsers.authorize(ugi1, "127.0.0.1");
       System.err.println("auth for " + ugi1.getUserName() + " succeeded");
       // expected
     } catch (AuthorizationException e) {



Mime
View raw message