svn merge -c 1182641 from trunk for HADOOP-7509.

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

View File

@ -416,6 +416,9 @@ Release 0.23.0 - Unreleased
HADOOP-7668. Add a NetUtils method that can tell if an InetAddress HADOOP-7668. Add a NetUtils method that can tell if an InetAddress
belongs to local host. (suresh) belongs to local host. (suresh)
HADOOP-7509. Improve exception message thrown when Authentication is
required. (Ravi Prakash via suresh)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole

View File

@ -1171,8 +1171,12 @@ public abstract class Server {
throw new IOException("Unable to read authentication method"); throw new IOException("Unable to read authentication method");
} }
if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) { if (isSecurityEnabled && authMethod == AuthMethod.SIMPLE) {
AccessControlException ae = new AccessControlException( AccessControlException ae = new AccessControlException("Authorization ("
"Authentication is required"); + 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, setupResponse(authFailedResponse, authFailedCall, Status.FATAL,
null, ae.getClass().getName(), ae.getMessage()); null, ae.getClass().getName(), ae.getMessage());
responder.doRespond(authFailedCall); responder.doRespond(authFailedCall);