You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:01:19 UTC
svn commit: r1077301 -
/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Author: omalley
Date: Fri Mar 4 04:01:19 2011
New Revision: 1077301
URL: http://svn.apache.org/viewvc?rev=1077301&view=rev
Log:
commit 9e70d3cef7902191767c4f7dba1a69b97f034d49
Author: Jakob Homan <jh...@yahoo-inc.com>
Date: Mon Mar 8 16:37:42 2010 -0800
HDFS:1023 from
https://issues.apache.org/jira/secure/attachment/12438241/HDFS-1023-Y20-Update-2.patch
+++ b/YAHOO-CHANGES.txt
+ HDFS-1023. Second Update to original patch to fix username (jhoman)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1077301&r1=1077300&r2=1077301&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Fri Mar 4 04:01:19 2011
@@ -227,13 +227,14 @@ public class NameNode implements ClientP
if(httpsUser == null) {
LOG.warn(DFSConfigKeys.DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY +
" not defined in config. Starting http server as "
- + DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY
+ + conf.get(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY)
+ ": Kerberized SSL may be not function correctly.");
} else {
// Kerberized SSL servers must be run from the host principal...
LOG.info("Logging in as " + httpsUser + " to start http server.");
DFSUtil.login(conf, DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY,
- DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY); }
+ DFSConfigKeys.DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY);
+ }
}
UserGroupInformation ugi = UserGroupInformation.getLoginUser();
try {
@@ -300,7 +301,7 @@ public class NameNode implements ClientP
if(UserGroupInformation.isSecurityEnabled() &&
conf.get(DFSConfigKeys.DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY) != null) {
// Go back to being the correct Namenode principal
- LOG.info("Logging back in as " + DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY
+ LOG.info("Logging back in as " + conf.get(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY)
+ " following http server start.");
DFSUtil.login(conf, DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY,
DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY);