commit 9e70d3cef7902191767c4f7dba1a69b97f034d49

Author: Jakob Homan <jhoman@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)
    +


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077301 13f79535-47bb-0310-9956-ffa450edef68

src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -227,13 +227,14 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
       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 ClientProtocol, DatanodeProtocol,
       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);