diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2008-11-19 10:43:57 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2008-11-19 10:43:57 +0000 |
| commit | f982be45e81588a27383cd1a3eb12789b8498904 (patch) | |
| tree | 07be283d015b2c39f95e655cb7328ff355bc47fa /net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c | |
| parent | - Fix modes of the temp directory [1] (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'.release/6.4.0
Notes
Notes:
svn path=/head/; revision=223035
svn path=/tags/RELEASE_6_4_0/; revision=223036; tag=release/6.4.0
Diffstat (limited to 'net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c')
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c index 570f9bb9347f..44c26b86d08c 100644 --- a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c +++ b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c @@ -1,19 +1,16 @@ -Index: snmplib/snmpTCPIPv6Domain.c -diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005 -+++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008 -@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport * +--- snmplib/snmpTCPIPv6Domain.c.orig 2008-06-17 17:57:14.000000000 +0900 ++++ snmplib/snmpTCPIPv6Domain.c 2008-11-14 21:34:12.000000000 +0900 +@@ -96,12 +96,23 @@ if (to == NULL) { return strdup("TCP/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]; ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - sprintf(tmp, "TCP/IPv6: [%s]:%hd", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -29,7 +26,6 @@ diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c + } + snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - |