com php-src: Partial fix for bug 61743 to get correct icacls path: ext/standard/tests/file/windows_acls/common.inc
| From: | Anatoliy Belsky | Date: | Wed, 25 Apr 2012 16:38:27 +0000 |
| Subject: | com php-src: Partial fix for bug 61743 to get correct icacls path: ext/standard/tests/file/windows_acls/common.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68875@lists.php.net to get a copy of this message | ||
Commit: 433290e199e29f38cfebf54ba213f4abff4e328a
Author: Anatoliy Belsky <ab@php.net> Wed, 25 Apr 2012 18:38:27 +0200
Parents: 270a406ac94b5fc5cc9ef59fc61e3b4b95648a3e
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=433290e199e29f38cfebf54ba213f4abff4e328a
Log:
Partial fix for bug 61743 to get correct icacls path
Bugs:
https://bugs.php.net/61743
Changed paths:
M ext/standard/tests/file/windows_acls/common.inc
Diff:
diff --git a/ext/standard/tests/file/windows_acls/common.inc
b/ext/standard/tests/file/windows_acls/common.inc
index c9be2f1..4007ad0 100644
--- a/ext/standard/tests/file/windows_acls/common.inc
+++ b/ext/standard/tests/file/windows_acls/common.inc
@@ -25,16 +25,29 @@ function get_username(){
$user = get_current_user();
}
+ if (!$user) {
+ $user = exec('echo %USERNAME%');
+ }
+
return $user;
}
function get_domainname()
{
- return getenv('USERDOMAIN');
+ $domain = getenv('USERDOMAIN');
+
+ return $domain;
+}
+
+function get_icacls()
+{
+ $sysroot = exec('echo %SYSTEMROOT%');
+
+ return "$sysroot\\System32\\icacls.exe";
}
function icacls_set($path, $mode, $perm) {
- $icacls = 'c:\\Windows\\System32\\icacls.exe';
+ $icacls = get_icacls();
$user = get_username();
$path_escaped = '"' . $path . '"';
$perm_entry = array();