diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
| commit | db08408462ac8afa1b95aec4eb8d3efeb283025d (patch) | |
| tree | ece8ff3df7fce16c95c4057f32346beae979dbd0 /zebra/zebra_snmp.c | |
| parent | cd2ec99e4e365bd61deebd61639cd3e1e777cdbe (diff) | |
| parent | 6e0989e113d9e2268e58cfe29922e971793c1d06 (diff) | |
| download | quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.bz2 quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.xz | |
Merge branch 'upstream' into jenner
Conflicts:
bgpd/bgp_aspath.c
bgpd/bgpd.c
lib/smux.c
lib/workqueue.c
ospfd/ospf_snmp.c
Diffstat (limited to 'zebra/zebra_snmp.c')
| -rw-r--r-- | zebra/zebra_snmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index b7843b26..0fde4bb8 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -344,7 +344,7 @@ get_fwtable_route_node(struct variable *v, oid objid[], size_t *objid_len, * ipForwardDest, ipForwardProto, ipForwardPolicy, ipForwardNextHop */ - if (*objid_len > v->namelen) + if (*objid_len > (unsigned) v->namelen) oid2in_addr (objid + v->namelen, MIN(4, *objid_len - v->namelen), &dest); if (*objid_len > (unsigned) v->namelen + 4) |