Partial fix for bug 61743 to get correct icacls path

diff --git a/ext/standard/tests/file/windows_acls/common.inc b/ext/standard/tests/file/windows_acls/common.inc
index c9be2f11e22a45f84543360635117fc827c0cbba..4007ad009d8a45ec6f7d3b8c1c3fa1b17c2d85be 100644 (file)
--- 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();