Additional fixs for bug 61746 - prepare/clean acls

Author: weltling

ext/standard/tests/file/windows_acls/bug44859.phpt

@@ -8,6 +8,7 @@ skipif();
 --FILE--
 <?php
 include_once __DIR__ . '/common.inc';
+fix_acls();
 
 $iteration = array(
 	PHPT_ACL_READ => false,

ext/standard/tests/file/windows_acls/bug44859_2.phpt

@@ -8,6 +8,7 @@ skipif();
 --FILE--
 <?php
 include_once __DIR__ . '/common.inc';
+fix_acls();
 
 $iteration = array(
 	PHPT_ACL_READ => true,

ext/standard/tests/file/windows_acls/bug44859_3.phpt

@@ -8,6 +8,7 @@ skipif();
 --FILE--
 <?php
 include_once __DIR__ . '/common.inc';
+fix_acls();
 
 $iteration = array(
 	'tiny.exe' => true,

ext/standard/tests/file/windows_acls/bug44859_4.phpt

@@ -10,6 +10,7 @@ skipif();
 --FILE--
 <?php
 include_once __DIR__ . '/common.inc';
+fix_acls();
 
 $iteration = array(
 	PHPT_ACL_READ => true,

ext/standard/tests/file/windows_acls/common.inc

@@ -46,6 +46,16 @@ function get_icacls()
 	return "$sysroot\\System32\\icacls.exe";
 }
 
+function fix_acls() {
+	$user = get_username();
+	/* Current user needs to be owner of the test files. As well
+	   all the other users having acls on the files must loose them.
+	   The following fixes this just partially, as dynamically reading
+	   all the users having acls on a file could be sophisticated. */
+	exec(get_icacls() . ' . /setowner $user /T /L /Q 2> nul');
+	exec(get_icacls() . ' . /remove:g Administrators /T /L /Q 2> nul');
+}
+
 function icacls_set($path, $mode, $perm) {
 	$icacls = get_icacls();
 	$user = get_username();