svn merge -c 1183132 from trunk for HADOOP-7745.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
922d03ead6
commit
50fa4d7698
|
@ -419,6 +419,9 @@ Release 0.23.0 - Unreleased
|
||||||
HADOOP-7509. Improve exception message thrown when Authentication is
|
HADOOP-7509. Improve exception message thrown when Authentication is
|
||||||
required. (Ravi Prakash via suresh)
|
required. (Ravi Prakash via suresh)
|
||||||
|
|
||||||
|
HADOOP-7745. Fix wrong variable name in exception message introduced
|
||||||
|
in HADOOP-7509. (Ravi Prakash via suresh)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
|
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
|
||||||
|
|
|
@ -1172,9 +1172,9 @@ public abstract class Server {
|
||||||
}
|
}
|
||||||
if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) {
|
if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) {
|
||||||
AccessControlException ae = new AccessControlException("Authorization ("
|
AccessControlException ae = new AccessControlException("Authorization ("
|
||||||
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION
|
|
||||||
+ ") is enabled but authentication ("
|
|
||||||
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION
|
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION
|
||||||
|
+ ") is enabled but authentication ("
|
||||||
|
+ CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION
|
||||||
+ ") is configured as simple. Please configure another method "
|
+ ") is configured as simple. Please configure another method "
|
||||||
+ "like kerberos or digest.");
|
+ "like kerberos or digest.");
|
||||||
setupResponse(authFailedResponse, authFailedCall, Status.FATAL,
|
setupResponse(authFailedResponse, authFailedCall, Status.FATAL,
|
||||||
|
|
Loading…
Reference in New Issue