php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- #40013, php_uname() does not return nodename on Netware (Guenter Knauf)

Browse Source
This commit is contained in:
Pierre Joye
2008-03-05 21:09:29 +00:00
parent 38b94446a4
commit 77fee69a7e
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -10,6 +10,8 @@ PHP NEWS
(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)

25
ext/standard/info.c
View File

@@ -326,6 +326,30 @@ PHPAPI char *php_get_uname(char mode)
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 @@ PHPAPI char *php_get_uname(char mode)
buf.machine);
php_uname = tmp_uname;
}
#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;