Make SNMP shut up properly

Author: TimWolla

ext/snmp/snmp.c

@@ -1997,6 +1997,13 @@ PHP_MINIT_FUNCTION(snmp)
 {
 	netsnmp_log_handler *logh;
 
+	/* Disable logging, use exit status'es and related variabled to detect errors */
+	shutdown_snmp_logging();
+	logh = netsnmp_register_loghandler(NETSNMP_LOGHANDLER_NONE, LOG_ERR);
+	if (logh) {
+		logh->pri_max = LOG_ERR;
+	}
+
 	init_snmp("snmpapp");
 	/* net-snmp corrupts the CTYPE locale during initialization. */
 	zend_reset_lc_ctype_locale();
@@ -2006,13 +2013,6 @@ PHP_MINIT_FUNCTION(snmp)
 	netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PERSIST_STATE, 1);
 #endif
 
-	/* Disable logging, use exit status'es and related variabled to detect errors */
-	shutdown_snmp_logging();
-	logh = netsnmp_register_loghandler(NETSNMP_LOGHANDLER_NONE, LOG_ERR);
-	if (logh) {
-		logh->pri_max = LOG_ERR;
-	}
-
 	memcpy(&php_snmp_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	php_snmp_object_handlers.read_property = php_snmp_read_property;
 	php_snmp_object_handlers.write_property = php_snmp_write_property;

ext/snmp/tests/skipif.inc

@@ -6,8 +6,5 @@ require_once (dirname(__FILE__).'/snmp_include.inc');
 //snmpget  ( string $hostname  , string $community  ,
 //string $object_id  [, int $timeout  [, int $retries  ]] )
 
-// net-snmp will just log to STDERR without asking. Close STDERR to prevent
-// the error output from marking the SKIPIF section as BORKed.
-fclose(STDERR);
 if (@snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout) === false)
     die('skip NO SNMPD on this host or community invalid');