]> granicus.if.org Git - php/commitdiff
- Fixed bug #49990 (SNMP3 warning message about security level printed twice).
authorJani Taskinen <jani@php.net>
Sun, 25 Oct 2009 20:17:04 +0000 (20:17 +0000)
committerJani Taskinen <jani@php.net>
Sun, 25 Oct 2009 20:17:04 +0000 (20:17 +0000)
NEWS
ext/snmp/snmp.c

diff --git a/NEWS b/NEWS
index b596461283b8fce527ea6e3ed9fc8b22af61e034..107e704ceb97b33e9b9517c7f95933c1a45c4d22 100644 (file)
--- 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)
index 0689e5270f51b42c36698f99184a73b75d724602..05626142777b51ca5acc2f8ad2f1abb8e09740fd 100644 (file)
@@ -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);