From 9d89fb8ca1d83cf90b5f92b6aab4115b68967ae1 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Thu, 13 Feb 2014 23:46:16 +0000 Subject: [PATCH] HADOOP-10249. LdapGroupsMapping should trim ldap password read from file. Contributed by Dilli Armugam. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568164 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/security/LdapGroupsMapping.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f14c33a1da..4e6dc469eb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -339,6 +339,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10338. Cannot get the FileStatus of the root inode from the new Globber (cmccabe) + HADOOP-10249. LdapGroupsMapping should trim ldap password read from file. + (Dilli Armugam via suresh) + Release 2.3.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java index eb62e8b2b9..c542b2aea0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java @@ -356,7 +356,7 @@ public class LdapGroupsMapping c = reader.read(); } reader.close(); - return password.toString(); + return password.toString().trim(); } catch (IOException ioe) { throw new RuntimeException("Could not read password file: " + pwFile, ioe); }