Date: Sat, 9 Aug 2014 13:55:31 GMT From: shonali@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272124 - in soc2014/shonali/head: contrib/bsnmp/snmp_target usr.sbin/bsnmpd Message-ID: <201408091355.s79DtVNB096301@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shonali Date: Sat Aug 9 13:55:31 2014 New Revision: 272124 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272124 Log: Corrections in target_snmp.c & Makefile Modified: soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c soc2014/shonali/head/usr.sbin/bsnmpd/Makefile Modified: soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c Sat Aug 9 13:53:15 2014 (r272123) +++ soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c Sat Aug 9 13:55:31 2014 (r272124) @@ -163,7 +163,8 @@ case LEAF_snmpTargetAddrTDomain: return (SNMP_ERR_INCONS_VALUE); case LEAF_snmpTargetAddrTAddress: - if (val->v.octetstring.len != SNMP_UDP_ADDR_SIZ && val->v.octetstring.len != SNMP_UDP_ADDRv6_SIZ) + if (val->v.octetstring.len != SNMP_UDP_ADDR_SIZ && + val->v.octetstring.len != SNMP_UDP_ADDRv6_SIZ) return (SNMP_ERR_INCONS_VALUE); if (val->v.octetstring.len == SNMP_UDP_ADDR_SIZ){ ctx->scratch->ptr1 = malloc(SNMP_UDP_ADDR_SIZ); @@ -173,9 +174,7 @@ SNMP_UDP_ADDR_SIZ); memcpy(addrs->address.address, val->v.octetstring.octets, SNMP_UDP_ADDR_SIZ); - } - - else if (val->v.octetstring.len == SNMP_UDP_ADDRv6_SIZ){ + } else if (val->v.octetstring.len == SNMP_UDP_ADDRv6_SIZ){ ctx->scratch->ptr1 = malloc(SNMP_UDP_ADDRv6_SIZ); if (ctx->scratch->ptr1 == NULL) return (SNMP_ERR_GENERR); @@ -282,14 +281,13 @@ switch (val->var.subs[sub - 1]) { case LEAF_snmpTargetAddrTAddress: if (val->var.len == SNMP_UDP_ADDR_SIZ) { - memcpy(addrs->address.address, ctx->scratch->ptr1, - SNMP_UDP_ADDR_SIZ); - free(ctx->scratch->ptr1); - } - else if (val->var.len == SNMP_UDP_ADDRv6_SIZ) { - memcpy(addrs->address.address6, ctx->scratch->ptr1, - SNMP_UDP_ADDRv6_SIZ); - free(ctx->scratch->ptr1); + memcpy(addrs->address.address, ctx->scratch->ptr1, + SNMP_UDP_ADDR_SIZ); + free(ctx->scratch->ptr1); + } else if (val->var.len == SNMP_UDP_ADDRv6_SIZ) { + memcpy(addrs->address.address6, ctx->scratch->ptr1, + SNMP_UDP_ADDRv6_SIZ); + free(ctx->scratch->ptr1); } break; @@ -330,9 +328,11 @@ return (oid_get(val, &oid_udp_domain)); case LEAF_snmpTargetAddrTAddress: if (val->var.len == SNMP_UDP_ADDR_SIZ) - return (string_get(val, addrs->address.address, SNMP_UDP_ADDR_SIZ)); + return (string_get(val, addrs->address.address, + SNMP_UDP_ADDR_SIZ)); if (val->var.len == SNMP_UDP_ADDRv6_SIZ) - return (string_get(val, addrs->address.address6, SNMP_UDP_ADDRv6_SIZ)); + return (string_get(val, addrs->address.address6, + SNMP_UDP_ADDRv6_SIZ)); case LEAF_snmpTargetAddrTimeout: val->v.integer = addrs->timeout; break; Modified: soc2014/shonali/head/usr.sbin/bsnmpd/Makefile ============================================================================== --- soc2014/shonali/head/usr.sbin/bsnmpd/Makefile Sat Aug 9 13:53:15 2014 (r272123) +++ soc2014/shonali/head/usr.sbin/bsnmpd/Makefile Sat Aug 9 13:55:31 2014 (r272124) @@ -1,13 +1,8 @@ # $FreeBSD$ -SUBDIR= gensnmpdef \ gensnmptree \ bsnmpd \ modules \ tools +SUBDIR= gensnmptree \ + bsnmpd \ + modules \ + tools + .include <bsd.subdir.mk> - cd usr.sbin/bsnmpd - mkdir gensnmpdef - cd gensnmpdef/ - fetch http://people.freebsd.org/~syrinx/Makefile - cd .. - make - make install - rehash - which gensnmpdef
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408091355.s79DtVNB096301>