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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -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

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_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,