sniper Mon Apr 10 11:56:18 2006 UTC
Modified files: (Branch: PHP_5_1)
/TSRM tsrm_virtual_cwd.h
/php-src/ext/standard filestat.c
Log:
MFH: - Fixed bug #36909 (ld: Undefined symbols: _lchown)
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.48.2.4&r2=1.48.2.5&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.48.2.4 TSRM/tsrm_virtual_cwd.h:1.48.2.5
--- TSRM/tsrm_virtual_cwd.h:1.48.2.4 Sun Mar 5 18:57:54 2006
+++ TSRM/tsrm_virtual_cwd.h Mon Apr 10 11:56:18 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.48.2.4 2006/03/05 18:57:54 derick Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5 2006/04/10 11:56:18 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.136.2.6&r2=1.136.2.7&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.6
php-src/ext/standard/filestat.c:1.136.2.7
--- php-src/ext/standard/filestat.c:1.136.2.6 Sun Apr 9 17:57:27 2006
+++ php-src/ext/standard/filestat.c Mon Apr 10 11:56:18 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.136.2.6 2006/04/09 17:57:27 iliaa Exp $ */
+/* $Id: filestat.c,v 1.136.2.7 2006/04/10 11:56:18 sniper Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -358,7 +358,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);
}
@@ -432,7 +434,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
