Attachment 194 Details for Bug 401 – patch to run openssh-3.5p1 on linux-2.2 & glibc-2.2(or later)

[patch] patch to run openssh-3.5p1 on linux-2.2 & glibc-2.2(or later)

openssh-fix.patch (text/plain), 1.19 KB, created by YOSHIFUJI Hideaki on 2003-01-06 12:20:40 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: YOSHIFUJI Hideaki

Created: 2003-01-06 12:20:40 AEDT

Size: 1.19 KB

patch

obsolete

>diff -ru openssh-3.5p1/canohost.c openssh-3.5p1-fix/canohost.c
>--- openssh-3.5p1/canohost.c	Wed Sep 25 11:19:09 2002
>+++ openssh-3.5p1-fix/canohost.c	Mon Jan  6 10:10:51 2003
>@@ -61,9 +61,15 @@
> 			from4->sin_family = AF_INET;
> 			memcpy(&from4->sin_addr, &addr, sizeof(addr));
> 			from4->sin_port = port;
>+
>+			fromlen = sizeof(struct sockaddr_in);
> 		}
> 	}
> #endif
>+#ifdef __linux__
>+	if (from.ss_family == AF_INET6)
>+		fromlen = sizeof(struct sockaddr_in6);
>+#endif
> 
> 	if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
> 	    NULL, 0, NI_NUMERICHOST) != 0)
>@@ -225,6 +231,12 @@
> 		    < 0)
> 			return NULL;
> 	}
>+
>+#ifdef __linux__
>+	if (addr.ss_family == AF_INET6)
>+		addrlen = sizeof(struct sockaddr_in6);
>+#endif
>+
> 	/* Get the address in ascii. */
> 	if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
> 	    NULL, 0, flags) != 0) {
>@@ -319,6 +331,12 @@
> 			fatal_cleanup();
> 		}
> 	}
>+
>+#ifdef __linux__
>+	if (from.ss_family == AF_INET6)
>+		fromlen = sizeof(struct sockaddr_in6);
>+#endif
>+
> 	/* Return port number. */
> 	if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
> 	    strport, sizeof(strport), NI_NUMERICSERV) != 0)
>Only in openssh-3.5p1-fix: canohost.c.orig

Actions: View | Diff

Attachments on bug 401: 148 | 194 | 195