pajoye Wed Mar 5 21:09:29 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard info.c
Log:
- #40013, php_uname() does not return nodename on Netware (Guenter Knauf)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1108&r2=1.2027.2.547.2.1109&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1108 php-src/NEWS:1.2027.2.547.2.1109
--- php-src/NEWS:1.2027.2.547.2.1108 Wed Mar 5 20:58:08 2008
+++ php-src/NEWS Wed Mar 5 21:09:29 2008
@@ -10,6 +10,8 @@
(Ilia)
- Fixed bug #42505 (new sendmail default breaks on Netware platform)
(Guenter Knauf)
+- Fixed bug #40013 (php_uname() does not return nodename on Netware
+ (Guenter Knauf)
27 Feb 2008, PHP 5.2.6RC1
- Fixed security issue detailed in CVE-2008-0599. (Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.16&r2=1.249.2.10.2.17&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.16
php-src/ext/standard/info.c:1.249.2.10.2.17
--- php-src/ext/standard/info.c:1.249.2.10.2.16 Sun Mar 2 15:36:09 2008
+++ php-src/ext/standard/info.c Wed Mar 5 21:09:29 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.16 2008/03/02 15:36:09 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.17 2008/03/05 21:09:29 pajoye Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -326,6 +326,30 @@
if (uname((struct utsname *)&buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d.%d",
+ buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "libc-%d.%d.%d
#%d",
+ buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d.%d
libc-%d.%d.%d #%d %s",
+ buf.sysname, buf.servername,
+ buf.netware_major, buf.netware_minor,
buf.netware_revision,
+ buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+ buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
@@ -342,6 +366,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
