Author: atm Date: Thu Jan 30 15:52:39 2014 New Revision: 1562867 URL: http://svn.apache.org/r1562867 Log: HADOOP-10310. SaslRpcServer should be initialized even when no secret manager present. Contributed by Aaron T. Myers.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1562867&r1=1562866&r2=1562867&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 30 15:52:39 2014 @@ -379,6 +379,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users (todd) + HADOOP-10310. SaslRpcServer should be initialized even when no secret + manager present. (atm) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1562867&r1=1562866&r2=1562867&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Thu Jan 30 15:52:39 2014 @@ -2120,7 +2120,7 @@ public abstract class Server { // Create the responder here responder = new Responder(); - if (secretManager != null) { + if (secretManager != null || UserGroupInformation.isSecurityEnabled()) { SaslRpcServer.init(conf); }