diff options
| author | Jani Taskinen <jani@php.net> | 2009-10-25 20:17:04 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-10-25 20:17:04 +0000 |
| commit | 70e8b40fc7a68008ca7d2b0e75a21b7fd0c50f8d (patch) | |
| tree | 7b903a5f22f31d456b57c465fc5ae65eb098e7b2 | |
| parent | bcf7db5f920435781b81ef581aa42615bd46f556 (diff) | |
| download | php-git-70e8b40fc7a68008ca7d2b0e75a21b7fd0c50f8d.tar.gz | |
- Fixed bug #49990 (SNMP3 warning message about security level printed twice).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -11,6 +11,8 @@ PHP NEWS - Fixed memory leak in extension loading when an error occurs on Windows. (Pierre) +- Fixed bug #49990 (SNMP3 warning message about security level printed twice). + (Jani) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning). diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 8667619d81..e53990e5af 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -981,7 +981,6 @@ static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level TSR s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; return (0); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", level); } return (-1); } @@ -1000,8 +999,6 @@ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol); return (0); - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", prot); } } return (-1); @@ -1053,8 +1050,6 @@ static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot T return (0); #endif #endif - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid privacy protocol: %s", prot); } } return (-1); |