- Fixed bug #49990 (SNMP3 warning message about security level printed twice).

diff --git a/NEWS b/NEWS
index 65d7df6bdba12747f6a2ab0c99634c5336c72950..909db7d93b18ca83c65fb3cce1346ccebb5a6cf4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 8667619d81c24f3f6912f00dbf8c962bc2b7e279..e53990e5afb9c6f9154d78d55f1d6e854ce87347 100644 (file)
--- 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);