From 1719e7c30076f8bbed61e8fd101fb91a63a9bed1 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Sun, 25 Oct 2009 20:17:04 +0000 Subject: [PATCH] - Fixed bug #49990 (SNMP3 warning message about security level printed twice). --- NEWS | 2 ++ ext/snmp/snmp.c | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index b596461283..107e704ceb 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ PHP NEWS - Fixed crash when instantiating PDORow and PDOStatement through Reflection. (Felipe) +- Fixed bug #49990 (SNMP3 warning message about security level printed twice). + (Jani) - Fixed bug #49972 (AppendIterator undefined function crash). (Johannes) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 0689e5270f..0562614277 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -817,7 +817,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); } @@ -836,8 +835,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); @@ -889,8 +886,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); -- 2.40.0