diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-01-03 14:24:16 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-01-03 14:24:16 +0000 |
| commit | e6d686487fa845a5b90234d0e49fe0da5e1c53d3 (patch) | |
| tree | 764be3dceb233eb09487fa1792dc7c2023a7ca2e | |
| parent | 9e1eb05bf081bf70b4f3a3e99614e001268c67f3 (diff) | |
fix parsing of get* requests with multiple varbind elements
| -rw-r--r-- | usr.sbin/snmpd/snmpe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/snmpd/snmpe.c b/usr.sbin/snmpd/snmpe.c index 609ca187f53..8befbd6e6dc 100644 --- a/usr.sbin/snmpd/snmpe.c +++ b/usr.sbin/snmpd/snmpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snmpe.c,v 1.5 2007/12/28 16:59:31 reyk Exp $ */ +/* $OpenBSD: snmpe.c,v 1.6 2008/01/03 14:24:15 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net> @@ -614,7 +614,7 @@ snmpe_parse(struct sockaddr_storage *ss, errstr = "invalid varbind element"; for (i = 1, a = msg->sm_varbind, last = NULL; - a != NULL; a = a->be_next, i++) { + a != NULL; a = next, i++) { next = a->be_next; if (a->be_class != BER_CLASS_UNIVERSAL && @@ -691,8 +691,8 @@ snmpe_parse(struct sockaddr_storage *ss, if (last == NULL) msg->sm_varbindresp = c; else - ber_replace_elements(last, c); - a = c; + ber_link_elements(last, c); + last = c; break; } } @@ -700,7 +700,6 @@ snmpe_parse(struct sockaddr_storage *ss, log_debug("snmpe_parse: state %d", state); goto varfail; } - last = a; } return (0); |