diff options
author | Boris Lytochkin <lytboris@php.net> | 2011-01-31 13:00:27 +0000 |
---|---|---|
committer | Boris Lytochkin <lytboris@php.net> | 2011-01-31 13:00:27 +0000 |
commit | c9a37f78983aee253b764528ba7733e55cd25f40 (patch) | |
tree | 735352f42ea63aa30aa6f4cdf281d3a22207cdb8 | |
parent | ddee7b1d778113c36195c26adb8fe5552dab643e (diff) | |
download | php-git-c9a37f78983aee253b764528ba7733e55cd25f40.tar.gz |
revert commit 307876
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | ext/snmp/snmp.c | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -8,9 +8,6 @@ - Fixed bug #53568 (swapped memset arguments in struct initialization). (crrodriguez at opensuse dot org) -- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree correctly) - (Boris Lytochkin) - 06 Jan 2010, PHP 5.2.17 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, Rasmus) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 2476d8a1cf..c0186c5a44 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -502,7 +502,7 @@ retry: } } } else { - if ((st != SNMP_CMD_WALK && st != SNMP_CMD_REALWALK) || response->errstat != SNMP_ERR_NOSUCHNAME) { + if (st != SNMP_CMD_WALK || response->errstat != SNMP_ERR_NOSUCHNAME) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat)); if (response->errstat == SNMP_ERR_NOSUCHNAME) { for (count=1, vars = response->variables; vars && count != response->errindex; |