cvs: php4 /ext/snmp snmp.c

harrie Mon Nov 11 13:45:50 2002 EDT Modified files: /php4/ext/snmp snmp.c Log: Fixing the php_info function. Print UCD-SNMP when UCD-SNMP is used. Print NET-SNMP when NET-SNMP is used. Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.67 php4/ext/snmp/snmp.c:1.68 --- php4/ext/snmp/snmp.c:1.67 Thu Oct 17 02:39:55 2002 +++ php4/ext/snmp/snmp.c Mon Nov 11 13:45:50 2002 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.67 2002/10/17 06:39:55 sniper Exp $ */ +/* $Id: snmp.c,v 1.68 2002/11/11 18:45:50 harrie Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -75,7 +75,6 @@ #ifdef HAVE_NET_SNMP #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> -#define VersionInfo NetSnmpVersionInfo #else #ifdef HAVE_DEFAULT_STORE_H #include "default_store.h" @@ -154,8 +153,13 @@ PHP_MINFO_FUNCTION(snmp) { php_info_print_table_start(); +#ifdef HAVE_NET_SNMP + php_info_print_table_row(2, "NET-SNMP Support", "enabled"); + php_info_print_table_row(2, "NET-SNMP Version", netsnmp_get_version()); +#else php_info_print_table_row(2, "UCD-SNMP Support", "enabled"); php_info_print_table_row(2, "UCD-SNMP Version", VersionInfo); +#endif php_info_print_table_end(); } /* }}} */