sniper Mon Apr 10 11:56:04 2006 UTC Modified files: /TSRM tsrm_virtual_cwd.h /php-src/ext/standard filestat.c Log: - Fixed bug #36909 (ld: Undefined symbols: _lchown) http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.52&r2=1.53&diff_format=u Index: TSRM/tsrm_virtual_cwd.h diff -u TSRM/tsrm_virtual_cwd.h:1.52 TSRM/tsrm_virtual_cwd.h:1.53 --- TSRM/tsrm_virtual_cwd.h:1.52 Wed Feb 8 20:49:40 2006 +++ TSRM/tsrm_virtual_cwd.h Mon Apr 10 11:56:04 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tsrm_virtual_cwd.h,v 1.52 2006/02/08 20:49:40 tony2001 Exp $ */ +/* $Id: tsrm_virtual_cwd.h,v 1.53 2006/04/10 11:56:04 sniper Exp $ */ #ifndef VIRTUAL_CWD_H #define VIRTUAL_CWD_H @@ -243,8 +243,10 @@ #define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC) #if !defined(TSRM_WIN32) && !defined(NETWARE) #define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0 TSRMLS_CC) +#if HAVE_LCHOWN #define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1 TSRMLS_CC) #endif +#endif #else @@ -286,8 +288,10 @@ #define VCWD_CHMOD(path, mode) chmod(path, mode) #if !defined(TSRM_WIN32) && !defined(NETWARE) #define VCWD_CHOWN(path, owner, group) chown(path, owner, group) +#if HAVE_LCHOWN #define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group) #endif +#endif #endif http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.145&r2=1.146&diff_format=u Index: php-src/ext/standard/filestat.c diff -u php-src/ext/standard/filestat.c:1.145 php-src/ext/standard/filestat.c:1.146 --- php-src/ext/standard/filestat.c:1.145 Sun Apr 9 17:58:02 2006 +++ php-src/ext/standard/filestat.c Mon Apr 10 11:56:04 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.145 2006/04/09 17:58:02 iliaa Exp $ */ +/* $Id: filestat.c,v 1.146 2006/04/10 11:56:04 sniper Exp $ */ #include "php.h" #include "fopen_wrappers.h" @@ -353,7 +353,9 @@ } if (do_lchgrp) { +#if HAVE_LCHOWN ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), -1, gid); +#endif } else { ret = VCWD_CHOWN(Z_STRVAL_PP(filename), -1, gid); } @@ -423,7 +425,9 @@ } if (do_lchown) { +#if HAVE_LCHOWN ret = VCWD_LCHOWN(Z_STRVAL_PP(filename), uid, -1); +#endif } else { ret = VCWD_CHOWN(Z_STRVAL_PP(filename), uid, -1); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php