kraghuba Fri Jul 6 03:24:28 2007 UTC
Modified files:
/php-src/ext/standard/tests/file 006_variation2.phpt 006_basic.phpt
006_variation1.phpt
Log:
Better check for root user
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?r1=1.2&r2=1.3&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.2
php-src/ext/standard/tests/file/006_variation2.phpt:1.3
--- php-src/ext/standard/tests/file/006_variation2.phpt:1.2 Tue Jul 3
07:13:04 2007
+++ php-src/ext/standard/tests/file/006_variation2.phpt Fri Jul 6 03:24:27 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.2&r2=1.3&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.2
php-src/ext/standard/tests/file/006_basic.phpt:1.3
--- php-src/ext/standard/tests/file/006_basic.phpt:1.2 Mon Jun 11 16:40:27 2007
+++ php-src/ext/standard/tests/file/006_basic.phpt Fri Jul 6 03:24:27 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_variation1.phpt?r1=1.2&r2=1.3&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.2
php-src/ext/standard/tests/file/006_variation1.phpt:1.3
--- php-src/ext/standard/tests/file/006_variation1.phpt:1.2 Tue Jul 3
07:13:04 2007
+++ php-src/ext/standard/tests/file/006_variation1.phpt Fri Jul 6 03:24:27 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
