From: Pierre Joye <pajoye@php.net>
Date: Fri, 16 Jan 2009 10:07:03 +0000 (+0000)
Subject: - simplify code by using OPENBASEDIR_CHECKPATH
X-Git-Tag: php-5.3.0beta1~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=192df76b26e93e426492ff188cf093afb73e4f44;p=php

- simplify code by using OPENBASEDIR_CHECKPATH
---

diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c
index 493bc866c9..7a6a212657 100644
--- a/ext/standard/link_win32.c
+++ b/ext/standard/link_win32.c
@@ -82,11 +82,7 @@ PHP_FUNCTION(readlink)
 		return;
 	}
 
-	if (PG(safe_mode) && !php_checkuid(link, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-		RETURN_FALSE;
-	}
-
-	if (php_check_open_basedir(link TSRMLS_CC)) {
+	if (OPENBASEDIR_CHECKPATH(link)) {
 		RETURN_FALSE;
 	}
 
@@ -194,19 +190,11 @@ PHP_FUNCTION(symlink)
 		RETURN_FALSE;
 	}
 
-	if (PG(safe_mode) && !php_checkuid(dest_p, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-		RETURN_FALSE;
-	}
-
-	if (PG(safe_mode) && !php_checkuid(source_p, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
+	if (OPENBASEDIR_CHECKPATH(dest_p)) {
 		RETURN_FALSE;
 	}
 
-	if (php_check_open_basedir(dest_p TSRMLS_CC)) {
-		RETURN_FALSE;
-	}
-
-	if (php_check_open_basedir(source_p TSRMLS_CC)) {
+	if (OPENBASEDIR_CHECKPATH(source_p)) {
 		RETURN_FALSE;
 	}
 
@@ -255,19 +243,11 @@ PHP_FUNCTION(link)
 		RETURN_FALSE;
 	}
 
-	if (PG(safe_mode) && !php_checkuid(dest_p, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-		RETURN_FALSE;
-	}
-
-	if (PG(safe_mode) && !php_checkuid(source_p, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-		RETURN_FALSE;
-	}
-
-	if (php_check_open_basedir(dest_p TSRMLS_CC)) {
+	if (OPENBASEDIR_CHECKPATH(source_p)) {
 		RETURN_FALSE;
 	}
 
-	if (php_check_open_basedir(source_p TSRMLS_CC)) {
+	if (OPENBASEDIR_CHECKPATH(dest_p)) {
 		RETURN_FALSE;
 	}