php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail

Browse Source
This commit is contained in:
Anatoliy Belsky
2012-04-16 13:30:58 +02:00
parent 21d314a767
commit 9a4cb732ed
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ext/standard/tests/file/windows_acls/common.inc
View File

@@ -19,7 +19,13 @@ function skipif() {
}
function get_username(){
return getenv('USERNAME');
$user = getenv('USERNAME');
if (!$user) {
$user = get_current_user();
}
return $user;
}
function get_domainname()
@@ -28,6 +34,7 @@ function get_domainname()
}
function icacls_set($path, $mode, $perm) {
$icacls = 'c:\\Windows\\System32\\icacls.exe';
$user = get_username();
$path_escaped = '"' . $path . '"';
$perm_entry = array();
@@ -38,7 +45,7 @@ function icacls_set($path, $mode, $perm) {
if ($perm & PHPT_ACL_FULL) $perm_entry[] = 'F';
// Deny all
$cmd = 'icacls ' . $path_escaped . ' /inheritance:r /deny ' . $user . ':(F,M,R,RX,W)';
$cmd = $icacls . ' ' . $path_escaped . ' /inheritance:r /deny ' . $user . ':(F,M,R,RX,W)';
exec($cmd);
if ($perm & PHPT_ACL_NONE) {
@@ -47,11 +54,9 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
$cmd .= ' ' . $user;
$cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
$cmd .= ' ' . $user;
$cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
return;
}
@@ -64,7 +69,7 @@ function icacls_set($path, $mode, $perm) {
// Deny all
$cmd = 'icacls ' . $path_escaped . ' /deny ' . $user . ':(F,M,R,RX,W)';
$cmd = $icacls . ' ' . $path_escaped . ' /deny ' . $user . ':(F,M,R,RX,W)';
exec($cmd);
/*
@@ -72,11 +77,9 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
$cmd .= ' ' . $user;
$cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
$cmd .= ' ' . $user;
$cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
@@ -91,15 +94,12 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
$cmd .= ' ' . get_username();
$cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
$cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
$cmd .= ' ' . get_username();
$cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
$cmd = 'icacls ' . $path_escaped . ' /' . $mode;
$cmd .= ' ' . get_username();
$cmd = $icacls . ' ' . $path_escaped . ' /' . $mode . ' ' . $user;
$cmd .= ':' . '(' . implode($perm_entry, ',') . ')';
exec($cmd);
}