svn merge -c 1183132 from trunk for HADOOP-7545.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-10-27 20:17:52 +00:00
parent 7b96fce0ae
commit 6a5956677e
2 changed files with 5 additions and 2 deletions

View File

@ -419,6 +419,9 @@ 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

View File

@ -1172,9 +1172,9 @@ public abstract class Server {
}
if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) {
AccessControlException ae = new AccessControlException("Authorization ("
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION
+ ") is enabled but authentication ("
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION
+ ") is enabled but authentication ("
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION
+ ") is configured as simple. Please configure another method "
+ "like kerberos or digest.");
setupResponse(authFailedResponse, authFailedCall, Status.FATAL,