commit ce9c0ab96346e7f608bebc960458590a2a06cef6

Author: Boris Shkolnik <borya@yahoo-inc.com>
Date:   Wed Mar 17 09:12:13 2010 -0700

    HADOOP:6633 from https://issues.apache.org/jira/secure/attachment/12438949/HADOOP-6633-BP20-2.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6633. normalize property names for JT/NN kerberos principal
    +    names in configuration. (boryas)
    +


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

src/core/org/apache/hadoop/security/authorize/ProxyUsers.java

@@ -34,7 +34,7 @@ public class ProxyUsers {
    * @return configuration key for superuser groups
    */
   public static String getProxySuperuserGroupConfKey(String userName) {
-    return "hadoop.proxyuser."+userName+".users";
+    return "hadoop.proxyuser."+userName+".groups";
   }
   
   /*
@@ -44,7 +44,7 @@ public class ProxyUsers {
    * @return configuration key for superuser ip-addresses
    */
   public static String getProxySuperuserIpConfKey(String userName) {
-    return "hadoop.proxyuser."+userName+".ip-addresses";
+    return "hadoop.proxyuser."+userName+".hosts";
   }
   
   /*

src/hdfs/org/apache/hadoop/hdfs/DFSConfigKeys.java

@@ -193,12 +193,12 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final String  DFS_WEB_UGI_KEY = "dfs.web.ugi";
   public static final String  DFS_NAMENODE_STARTUP_KEY = "dfs.namenode.startup";
   public static final String  DFS_DATANODE_KEYTAB_FILE_KEY = "dfs.datanode.keytab.file";
-  public static final String  DFS_DATANODE_USER_NAME_KEY = "dfs.datanode.user.name";
+  public static final String  DFS_DATANODE_USER_NAME_KEY = "dfs.datanode.kerberos.principal";
   public static final String  DFS_NAMENODE_KEYTAB_FILE_KEY = "dfs.namenode.keytab.file";
-  public static final String  DFS_NAMENODE_USER_NAME_KEY = "dfs.namenode.user.name";
-  public static final String  DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY = "dfs.namenode.krb.https.user.name";
+  public static final String  DFS_NAMENODE_USER_NAME_KEY = "dfs.namenode.kerberos.principal";
+  public static final String  DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY = "dfs.namenode.kerberos.https.principal";
   
   public static final String  DFS_SECONDARY_NAMENODE_KEYTAB_FILE_KEY = "dfs.secondary.namenode.keytab.file";
-  public static final String  DFS_SECONDARY_NAMENODE_USER_NAME_KEY = "dfs.secondary.namenode.user.name";
-  public static final String  DFS_SECONDARY_NAMENODE_KRB_HTTPS_USER_NAME_KEY = "dfs.secondary.namenode.krb.https.user.name";
+  public static final String  DFS_SECONDARY_NAMENODE_USER_NAME_KEY = "dfs.secondary.namenode.kerberos.principal";
+  public static final String  DFS_SECONDARY_NAMENODE_KRB_HTTPS_USER_NAME_KEY = "dfs.secondary.namenode.kerberos.https.principal";
 }

src/mapred/org/apache/hadoop/mapred/JobTracker.java

@@ -1991,7 +1991,7 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
     this(conf, generateNewIdentifier(), clock);
   }
   
-  public static final String JT_USER_NAME = "mapreduce.jobtracker.user.name";
+  public static final String JT_USER_NAME = "mapreduce.jobtracker.kerberos.principal";
   public static final String JT_KEYTAB_FILE =
     "mapreduce.jobtracker.keytab.file";
   

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -572,7 +572,7 @@ public class TaskTracker
                             protocol);
     }
   }
-  public static final String TT_USER_NAME = "mapreduce.tasktracker.user.name";
+  public static final String TT_USER_NAME = "mapreduce.tasktracker.kerberos.principal";
   public static final String TT_KEYTAB_FILE =
     "mapreduce.tasktracker.keytab.file";  
   /**