Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1205281 - in
 /hadoop/common/branches/branch-0.20-security:
 CHANGES.txt src/c++/task-controller/impl/task-controller.c
Date: Wed, 23 Nov 2011 04:21:30 -0000
To: common-commits@hadoop.apache.org
From: eli@apache.org
Message-Id: <20111123042131.1D1D32388860@eris.apache.org>

Author: eli
Date: Wed Nov 23 04:21:29 2011
New Revision: 1205281

URL: http://svn.apache.org/viewvc?rev=1205281&view=rev
Log:
MAPREDUCE-2103. task-controller shouldn't require o-r permissions. Contributed by Eli Collins

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/src/c++/task-controller/impl/task-controller.c

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1205281&r1=1205280&r2=1205281&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Nov 23 04:21:29 2011
@@ -95,6 +95,8 @@ Release 0.20.206.0 - unreleased
 
     MAPREDUCE-3424. Some LinuxTaskController cleanup (eli)
 
+    MAPREDUCE-2103. task-controller shouldn't require o-r permissions. (eli)
+
 Release 0.20.205.1 - unreleased
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-0.20-security/src/c++/task-controller/impl/task-controller.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/c%2B%2B/task-controller/impl/task-controller.c?rev=1205281&r1=1205280&r2=1205281&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/c++/task-controller/impl/task-controller.c (original)
+++ hadoop/common/branches/branch-0.20-security/src/c++/task-controller/impl/task-controller.c Wed Nov 23 04:21:29 2011
@@ -103,7 +103,7 @@ char* get_executable() {
  * promisable. For this, we need task-controller binary to
  *    * be user-owned by root
  *    * be group-owned by a configured special group.
- *    * others do not have any permissions
+ *    * others do not have write/execute permissions
  *    * be setuid
  */
 int check_taskcontroller_permissions(char *executable_file) {
@@ -141,12 +141,11 @@ int check_taskcontroller_permissions(cha
     return -1;
   }
 
-  // check others do not have read/write/execute permissions
-  if ((filestat.st_mode & S_IROTH) == S_IROTH ||
-      (filestat.st_mode & S_IWOTH) == S_IWOTH ||
+  // check others do not have write/execute permissions
+  if ((filestat.st_mode & S_IWOTH) == S_IWOTH ||
       (filestat.st_mode & S_IXOTH) == S_IXOTH) {
     fprintf(LOGFILE,
-            "The task-controller binary should not have read or write or"
+            "The task-controller binary should not have write or"
             " execute for others.\n");
     return -1;
   }