Attachment 195 Details for Bug 401 – More simple patch

[patch] More simple patch

canohost.diff (text/plain), 1.27 KB, created by Damien Miller on 2003-01-07 10:21:28 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2003-01-07 10:21:28 AEDT

Size: 1.27 KB

patch

obsolete

>Index: canohost.c
>===================================================================
>RCS file: /var/cvs/openssh/canohost.c,v
>retrieving revision 1.32
>diff -u -r1.32 canohost.c
>--- canohost.c	23 Dec 2002 02:13:38 -0000	1.32
>+++ canohost.c	6 Jan 2003 23:20:44 -0000
>@@ -59,11 +59,14 @@
> 			memset(&from, 0, sizeof(from));
> 
> 			from4->sin_family = AF_INET;
>+			fromlen = sizeof(*from4);
> 			memcpy(&from4->sin_addr, &addr, sizeof(addr));
> 			from4->sin_port = port;
> 		}
> 	}
> #endif
>+	if (from.ss_family == AF_INET6)
>+		fromlen = sizeof(struct sockaddr_in6);
> 
> 	if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
> 	    NULL, 0, NI_NUMERICHOST) != 0)
>@@ -225,6 +228,11 @@
> 		    < 0)
> 			return NULL;
> 	}
>+
>+	/* Work around Linux IPv6 weirdness */
>+	if (addr.ss_family == AF_INET6)
>+		addrlen = sizeof(struct sockaddr_in6);
>+
> 	/* Get the address in ascii. */
> 	if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
> 	    NULL, 0, flags) != 0) {
>@@ -319,6 +327,11 @@
> 			fatal_cleanup();
> 		}
> 	}
>+
>+	/* Work around Linux IPv6 weirdness */
>+	if (from.ss_family == AF_INET6)
>+		fromlen = sizeof(struct sockaddr_in6);
>+
> 	/* Return port number. */
> 	if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
> 	    strport, sizeof(strport), NI_NUMERICSERV) != 0)

Actions: View | Diff

Attachments on bug 401: 148 | 194 | 195