From: Stefan Esser <sesser@php.net>
Date: Wed, 20 Mar 2002 09:02:54 +0000 (+0000)
Subject: MFH of safe_mode.c text fix
X-Git-Tag: php-4.2.0RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72ff5105ef2313c553a9160ddeb1d7ce05b26ad1;p=php

MFH of safe_mode.c text fix
---

diff --git a/main/safe_mode.c b/main/safe_mode.c
index f4f30d0e2f..d3ffab6a3f 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -46,7 +46,7 @@
 PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 {
 	struct stat sb;
-	int ret;
+	int ret, nofile=0;
 	long uid=0L, gid=0L, duid=0L, dgid=0L;
 	char path[MAXPATHLEN];
 	char *s;
@@ -86,6 +86,7 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 				php_error(E_WARNING, "Unable to access %s", filename);
 				return 1;
 			}
+			nofile = 1;
 		} else {
 			uid = sb.st_uid;
 			gid = sb.st_gid;
@@ -150,6 +151,13 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 			*s = 0;
 		}
 	}
+	
+	if (nofile) {
+		uid = duid;
+		gid = dgid;
+		filename = path;
+	}
+	
 	if (PG(safe_mode_gid)) {
 		php_error(E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid/gid is %ld/%ld is not allowed to access %s owned by uid/gid %ld/%ld", php_getuid(), php_getgid(), filename, uid, gid);
 	} else {