cvs: php-src(PHP_5_2) /ext/standard/tests/file 006_basic.phpt 006_variation1.phpt 006_variation2.phpt

kraghuba Fri Jul 6 03:40:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file 006_variation1.phpt 006_variation2.phpt 006_basic.phpt Log: better check for root user http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/006_variation1.phpt diff -u php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/006_variation1.phpt:1.1.2.1 Tue Jul 3 07:10:01 2007 +++ php-src/ext/standard/tests/file/006_variation1.phpt Fri Jul 6 03:40:31 2007 @@ -5,9 +5,17 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not on Windows'); } -elseif (get_current_user() == 'root') { - die( "skip Do not run with root permissions" ); +// Skip if being run by root +$filename = dirname(__FILE__)."/006_root_check.tmp"; +$fp = fopen($filename, 'w'); +fclose($fp); +if(fileowner($filename) == 0) { + unlink ($filename); + die('skip...cannot be run as root\n'); } + +unlink($filename); + ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/006_variation2.phpt diff -u php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.1 php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/006_variation2.phpt:1.1.2.1 Tue Jul 3 07:10:01 2007 +++ php-src/ext/standard/tests/file/006_variation2.phpt Fri Jul 6 03:40:31 2007 @@ -5,9 +5,17 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not on Windows'); } -elseif (get_current_user() == 'root') { - die( "skip Do not run with root permissions" ); +// Skip if being run by root +$filename = dirname(__FILE__)."/006_root_check.tmp"; +$fp = fopen($filename, 'w'); +fclose($fp); +if(fileowner($filename) == 0) { + unlink ($filename); + die('skip...cannot be run as root\n'); } + +unlink($filename); + ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/006_basic.phpt diff -u php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.1 php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/006_basic.phpt:1.1.2.1 Mon Jun 11 16:14:59 2007 +++ php-src/ext/standard/tests/file/006_basic.phpt Fri Jul 6 03:40:31 2007 @@ -5,9 +5,17 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip Not on Windows'); } -elseif (get_current_user() == 'root') { - die( "skip Do not run with root permissions" ); +// Skip if being run by root +$filename = dirname(__FILE__)."/006_root_check.tmp"; +$fp = fopen($filename, 'w'); +fclose($fp); +if(fileowner($filename) == 0) { + unlink ($filename); + die('skip...cannot be run as root\n'); } + +unlink($filename); + ?> --FILE-- <?php