From 922d03ead68f0ad0da0fe794c50c457cecc60fc7 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Thu, 27 Oct 2011 20:21:11 +0000 Subject: [PATCH] svn revert -c -1189989 for fixing the commit message (should be HADOOP-7745, not HADOOP-7545) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189992 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- .../src/main/java/org/apache/hadoop/ipc/Server.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index df4accc72d3..bc8c8cefaba 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -419,9 +419,6 @@ Release 0.23.0 - Unreleased HADOOP-7509. Improve exception message thrown when Authentication is required. (Ravi Prakash via suresh) - HADOOP-7545. Fix wrong variable name in exception message introduced - in HADOOP-7509. (Ravi Prakash via suresh) - OPTIMIZATIONS HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java index 44b361b610e..50b06dc342d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java @@ -1172,9 +1172,9 @@ public abstract class Server { } if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) { AccessControlException ae = new AccessControlException("Authorization (" - + CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION - + ") is enabled but authentication (" + CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION + + ") is enabled but authentication (" + + CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION + ") is configured as simple. Please configure another method " + "like kerberos or digest."); setupResponse(authFailedResponse, authFailedCall, Status.FATAL,