From ecfea8264717adb7a871f041f85c3227e95fe03b Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Mon, 16 Jun 2014 23:11:34 +0000 Subject: [PATCH] HADOOP-10702. Merging change r1603023 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603024 13f79535-47bb-0310-9956-ffa450edef68 --- .../authentication/server/KerberosAuthenticationHandler.java | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java index 333eb8e43a0..48273905429 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java @@ -193,7 +193,7 @@ public class KerberosAuthenticationHandler implements AuthenticationHandler { for (String spnegoPrincipal : spnegoPrincipals) { LOG.info("Login using keytab {}, for principal {}", - keytab, principal); + keytab, spnegoPrincipal); final KerberosConfiguration kerberosConfiguration = new KerberosConfiguration(keytab, spnegoPrincipal); final LoginContext loginContext = diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index af490aa94b6..f1a455cca21 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -219,6 +219,9 @@ Release 2.5.0 - UNRELEASED HADOOP-10683. Users authenticated with KERBEROS are recorded as being authenticated with SIMPLE. (Benoy Antony via cnauroth) + HADOOP-10702. KerberosAuthenticationHandler does not log the principal names + correctly. (Benoy Antony via cnauroth) + BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS HADOOP-10520. Extended attributes definition and FileSystem APIs for