Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1376929 FIXES: HADOOP-8725. MR is broken when security is off (daryn via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376931 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-08-24 14:17:45 +00:00
parent 76755a9374
commit 6175155cf4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -798,6 +798,8 @@ Release 0.23.3 - UNRELEASED
HADOOP-8709. globStatus changed behavior from 0.20/1.x (Jason Lowe via HADOOP-8709. globStatus changed behavior from 0.20/1.x (Jason Lowe via
bobby) bobby)
HADOOP-8725. MR is broken when security is off (daryn via bobby)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
NEW FEATURES NEW FEATURES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
View File

@ -642,7 +642,7 @@ public class UserGroupInformation {
AuthenticationMethod.SIMPLE); AuthenticationMethod.SIMPLE);
loginUser = new UserGroupInformation(login.getSubject()); loginUser = new UserGroupInformation(login.getSubject());
String fileLocation = System.getenv(HADOOP_TOKEN_FILE_LOCATION); String fileLocation = System.getenv(HADOOP_TOKEN_FILE_LOCATION);
if (fileLocation != null && isSecurityEnabled()) { if (fileLocation != null) {
// load the token storage file and put all of the tokens into the // load the token storage file and put all of the tokens into the
// user. // user.
Credentials cred = Credentials.readTokenStorageFile( Credentials cred = Credentials.readTokenStorageFile(