Merge -r1174916:1174917 from branch-0.20-security-205 to fix HADOOP-7676

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

CHANGES.txt

@@ -482,6 +482,8 @@ Release 0.20.205.0 - 2011.10.06
     HDFS-2411. With webhdfs enabled in secure mode the auth to local mappings 
     are not being respected. (jitendra)
 
+    HADOOP-7676. Enable hbase to run as hdfs user (gkesavan)
+
   IMPROVEMENTS
 
     MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf)

src/packages/templates/conf/core-site.xml

@@ -33,6 +33,8 @@
     <name>hadoop.security.auth_to_local</name>
     <value>
 	RULE:[2:$1@$0]([jt]t@.*${KERBEROS_REALM})s/.*/${HADOOP_MR_USER}/
+        RULE:[2:$1@$0](hm@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
+        RULE:[2:$1@$0](rs@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
         RULE:[2:$1@$0]([nd]n@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
         RULE:[2:$1@$0](mapred@.*${KERBEROS_REALM})s/.*/${HADOOP_MR_USER}/
         RULE:[2:$1@$0](hdfs@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/