diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2008-11-15 00:56:29 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2008-11-15 00:56:29 +0000 |
| commit | 0f24cfd8c9266d843eabb04f373c3f5eebc05239 (patch) | |
| tree | 941ccc879107cd5cb55b679442233f94e7d10c17 /net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c | |
| parent | Upgrade to 5.3.2.3 (includes fix for CVE-2008-4309). (diff) | |
Upgrade to 5.4.2.1 (includes fix for CVE-2008-4309).
Notes
Notes:
svn path=/head/; revision=222858
Diffstat (limited to 'net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c')
| -rw-r--r-- | net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c index ad98e534bdf2..62ceec96c330 100644 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c @@ -1,17 +1,16 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig 2007-06-11 07:22:55.000000000 +0900 -+++ snmplib/snmpUDPIPv6Domain.c 2008-03-26 07:47:55.942743517 +0900 -@@ -109,13 +109,24 @@ +--- snmplib/snmpUDPIPv6Domain.c.orig 2007-09-29 22:10:22.000000000 +0900 ++++ snmplib/snmpUDPIPv6Domain.c 2008-11-14 21:36:45.000000000 +0900 +@@ -109,12 +109,22 @@ if (to == NULL) { return strdup("UDP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - +- char tmp[INET6_ADDRSTRLEN + 18]; +- - sprintf(tmp, "UDP/IPv6: [%s]:%hu", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -27,7 +26,6 @@ + } + snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - |