CVS update: php3/functions

Date: Saturday September 19, 1998 @ 16:17 Author: rasmus Update of /repository/php3/functions In directory asf:/export/home/rasmus/php3/functions Modified Files: db.c dbase.c file.c filepro.c filestat.c link.c zlib.c Log Message: safe mode message cleanup Index: php3/functions/db.c diff -c php3/functions/db.c:1.76 php3/functions/db.c:1.77 *** php3/functions/db.c:1.76 Fri Aug 14 19:47:14 1998 --- php3/functions/db.c Sat Sep 19 16:17:15 1998 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.76 1998/08/14 23:47:14 steffann Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: db.c,v 1.77 1998/09/19 20:17:15 rasmus Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif *************** *** 297,303 **** } if (php3_ini.safe_mode && (!_php3_checkuid(filename, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); return NULL; } --- 297,302 ---- Index: php3/functions/dbase.c diff -c php3/functions/dbase.c:1.65 php3/functions/dbase.c:1.66 *** php3/functions/dbase.c:1.65 Tue Sep 15 10:12:09 1998 --- php3/functions/dbase.c Sat Sep 19 16:17:16 1998 *************** *** 130,136 **** convert_to_long(options); if (php3_ini.safe_mode && (!_php3_checkuid(dbf_name->value.str.val, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); RETURN_FALSE; } --- 130,135 ---- *************** *** 491,497 **** } if (php3_ini.safe_mode && (!_php3_checkuid(filename->value.str.val, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); RETURN_FALSE; } --- 490,495 ---- Index: php3/functions/file.c diff -c php3/functions/file.c:1.181 php3/functions/file.c:1.182 *** php3/functions/file.c:1.181 Wed Sep 16 17:45:48 1998 --- php3/functions/file.c Sat Sep 19 16:17:16 1998 *************** *** 26,32 **** | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: file.c,v 1.181 1998/09/16 21:45:48 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 26,32 ---- | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: file.c,v 1.182 1998/09/19 20:17:16 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 1083,1089 **** convert_to_long(arg2); mode = arg2->value.lval; if (php3_ini.safe_mode &&(!_php3_checkuid(arg1->value.str.val,3))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner of parent directory."); RETURN_FALSE; } ret = mkdir(arg1->value.str.val,mode); --- 1083,1088 ---- *************** *** 1104,1110 **** } convert_to_string(arg1); if (php3_ini.safe_mode &&(!_php3_checkuid(arg1->value.str.val,1))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner of directory to be removed."); RETURN_FALSE; } ret = rmdir(arg1->value.str.val); --- 1103,1108 ---- *************** *** 1269,1277 **** new = NEW->value.str.val; if (php3_ini.safe_mode &&(!_php3_checkuid(old,2))) { - php3_error(E_WARNING, - "SAFE MODE Restriction in effect. " - "Invalid owner of file to be renamed."); RETURN_FALSE; } ret = rename(old, new); --- 1267,1272 ---- *************** *** 1301,1309 **** convert_to_string(target); if (php3_ini.safe_mode &&(!_php3_checkuid(source->value.str.val,2))) { - php3_error(E_WARNING, - "SAFE MODE Restriction in effect. " - "Invalid owner of file to be renamed."); RETURN_FALSE; } --- 1296,1301 ---- Index: php3/functions/filepro.c diff -c php3/functions/filepro.c:1.33 php3/functions/filepro.c:1.34 *** php3/functions/filepro.c:1.33 Fri Aug 14 19:47:15 1998 --- php3/functions/filepro.c Sat Sep 19 16:17:17 1998 *************** *** 213,219 **** sprintf(workbuf, "%s/map", dir->value.str.val); if (php3_ini.safe_mode && (!_php3_checkuid(workbuf, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); RETURN_FALSE; } --- 213,218 ---- *************** *** 309,315 **** sprintf(workbuf, "%s/key", FP_GLOBAL(fp_database)); if (php3_ini.safe_mode && (!_php3_checkuid(workbuf, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); RETURN_FALSE; } --- 308,313 ---- *************** *** 519,525 **** sprintf(workbuf, "%s/key", FP_GLOBAL(fp_database)); if (php3_ini.safe_mode && (!_php3_checkuid(workbuf, 2))) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner."); RETURN_FALSE; } --- 517,522 ---- Index: php3/functions/filestat.c diff -c php3/functions/filestat.c:1.77 php3/functions/filestat.c:1.78 *** php3/functions/filestat.c:1.77 Sun Sep 6 16:46:09 1998 --- php3/functions/filestat.c Sat Sep 19 16:17:17 1998 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: filestat.c,v 1.77 1998/09/06 20:46:09 jaakko Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: filestat.c,v 1.78 1998/09/19 20:17:17 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 146,153 **** /* #if PHP_SAFE_MODE */ if (php3_ini.safe_mode &&(!_php3_checkuid(filename->value.str.val, 1))) { - php3_error(E_WARNING, "SAFE MODE restriction in effect. " - "Invalid owner of file to be changed."); RETURN_FALSE; } /* #endif */ --- 146,151 ---- *************** *** 191,198 **** } if (php3_ini.safe_mode &&(!_php3_checkuid(filename->value.str.val, 1))) { - php3_error(E_WARNING, "SAFE MODE restriction in effect. " - "Invalid owner of file to be changed."); RETURN_FALSE; } --- 189,194 ---- *************** *** 222,229 **** convert_to_long(mode); if (php3_ini.safe_mode &&(!_php3_checkuid(filename->value.str.val, 1))) { - php3_error(E_WARNING, "SAFE MODE restriction in effect. " - "Invalid owner of file to be changed."); RETURN_FALSE; } --- 218,223 ---- *************** *** 273,279 **** convert_to_string(filename); if (php3_ini.safe_mode &&(!_php3_checkuid(filename->value.str.val, 1))) { - php3_error(E_WARNING, "SAFE MODE restriction in effect. Invalid owner of file to be changed."); if (newtime) efree(newtime); RETURN_FALSE; } --- 267,272 ---- Index: php3/functions/link.c diff -c php3/functions/link.c:1.29 php3/functions/link.c:1.30 *** php3/functions/link.c:1.29 Thu Jun 18 17:13:16 1998 --- php3/functions/link.c Sat Sep 19 16:17:18 1998 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: link.c,v 1.29 1998/06/18 21:13:16 jim Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: link.c,v 1.30 1998/09/19 20:17:18 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 118,124 **** convert_to_string(frompath); if (php3_ini.safe_mode && !_php3_checkuid(topath->value.str.val, 2)) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner of file to be linked."); RETURN_FALSE; } --- 118,123 ---- *************** *** 144,150 **** convert_to_string(frompath); if (php3_ini.safe_mode && !_php3_checkuid(topath->value.str.val, 2)) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner of file to be linked."); RETURN_FALSE; } --- 143,148 ---- *************** *** 169,175 **** convert_to_string(filename); if (php3_ini.safe_mode && !_php3_checkuid(filename->value.str.val, 2)) { - php3_error(E_WARNING, "SAFE MODE Restriction in effect. Invalid owner of file to be unlinked."); RETURN_FALSE; } --- 167,172 ---- Index: php3/functions/zlib.c diff -c php3/functions/zlib.c:1.8 php3/functions/zlib.c:1.9 *** php3/functions/zlib.c:1.8 Sun Aug 30 15:26:35 1998 --- php3/functions/zlib.c Sat Sep 19 16:17:19 1998 *************** *** 22,28 **** | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ ! /* $Id: zlib.c,v 1.8 1998/08/30 19:26:35 shane Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif --- 22,28 ---- | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ ! /* $Id: zlib.c,v 1.9 1998/09/19 20:17:19 rasmus Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif *************** *** 225,231 **** } else { if (options & ENFORCE_SAFE_MODE && ZLIB_INI(safe_mode) && (!_php3_checkuid(path,1))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner of file to be read."); return NULL; } if (_php3_check_open_basedir(path)) return NULL; --- 225,230 ---- *************** *** 252,258 **** /* Relative path open */ if (*filename == '.') { if (ZLIB_INI(safe_mode) &&(!_php3_checkuid(filename,2))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } if (_php3_check_open_basedir(filename)) return NULL; --- 251,256 ---- *************** *** 272,278 **** if (ZLIB_INI(safe_mode)) { snprintf(trypath,MAXPATHLEN,"%s%s",ZLIB_INI(doc_root),filename); if (!_php3_checkuid(trypath,2)) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } if (_php3_check_open_basedir(trypath)) return NULL; --- 270,275 ---- *************** *** 289,295 **** if (!path || (path && !*path)) { if (ZLIB_INI(safe_mode) &&(!_php3_checkuid(filename,2))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } if (_php3_check_open_basedir(filename)) return NULL; --- 286,291 ---- *************** *** 317,323 **** snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename); if (ZLIB_INI(safe_mode)) { if (stat(trypath,&sb) == 0 &&(!_php3_checkuid(trypath,2))) { - php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); efree(pathbuf); return(NULL); } --- 313,318 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net