Repository: hadoop Updated Branches: refs/heads/trunk 86ac0d40b -> f7e89bb34
HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f7e89bb3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f7e89bb3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f7e89bb3 Branch: refs/heads/trunk Commit: f7e89bb349d4512b47f94b545e3f489a85e851f0 Parents: 86ac0d4 Author: Jian He <[email protected]> Authored: Fri Oct 24 12:48:57 2014 -0700 Committer: Jian He <[email protected]> Committed: Fri Oct 24 12:50:27 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/winutils/task.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7e89bb3/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7b48a4b..8feed65 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -339,6 +339,9 @@ Trunk (Unreleased) HADOOP-11022. User replaced functions get lost 2-3 levels deep (e.g., sbin) (aw) + HADOOP-11228. Winutils task: unsecure path should not call + AddNodeManagerAndUserACEsToObject. (Remus Rusanu via jianhe) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7e89bb3/hadoop-common-project/hadoop-common/src/main/winutils/task.c ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/winutils/task.c b/hadoop-common-project/hadoop-common/src/main/winutils/task.c index f0fc19a..bfdbd63 100644 --- a/hadoop-common-project/hadoop-common/src/main/winutils/task.c +++ b/hadoop-common-project/hadoop-common/src/main/winutils/task.c @@ -627,11 +627,13 @@ DWORD CreateTaskImpl(__in_opt HANDLE logonHandle, __in PCWSTR jobObjName,__in PC return dwErrorCode; } - dwErrorCode = AddNodeManagerAndUserACEsToObject(jobObject, userName, JOB_OBJECT_ALL_ACCESS); - if (dwErrorCode) { - ReportErrorCode(L"AddNodeManagerAndUserACEsToObject", dwErrorCode); - CloseHandle(jobObject); - return dwErrorCode; + if (logonHandle != NULL) { + dwErrorCode = AddNodeManagerAndUserACEsToObject(jobObject, userName, JOB_OBJECT_ALL_ACCESS); + if (dwErrorCode) { + ReportErrorCode(L"AddNodeManagerAndUserACEsToObject", dwErrorCode); + CloseHandle(jobObject); + return dwErrorCode; + } } if(AssignProcessToJobObject(jobObject, GetCurrentProcess()) == 0) @@ -706,6 +708,8 @@ DWORD CreateTaskImpl(__in_opt HANDLE logonHandle, __in PCWSTR jobObjName,__in PC dwErrorCode = GetLastError(); ReportErrorCode(L"CreateProcess", dwErrorCode); } + + // task create (w/o createAsUser) does not need the ACEs change on the process goto create_process_done; }
