Attachment 365 Details for Bug 336 – Make OpenSSH work on old Linuxes

[patch] Make OpenSSH work on old Linuxes

openssh-oldlinux.patch (text/plain), 2.27 KB, created by Darren Tucker on 2003-08-06 18:42:37 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-08-06 18:42:37 AEST

Size: 2.27 KB

patch

obsolete

>Index: session.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/session.c,v
>retrieving revision 1.242
>diff -u -r1.242 session.c
>--- session.c	2 Aug 2003 12:24:50 -0000	1.242
>+++ session.c	5 Aug 2003 23:58:37 -0000
>@@ -1702,6 +1702,7 @@
> 	break_length = packet_get_int();
> 	packet_check_eom();
> 
>+#if defined(TIOCSBRK) && defined(TIOCCBRK)
> 	if (s->ttyfd == -1)
> 		return 0;
> 	/* we will sleep from 500ms to 3000ms */
>@@ -1712,6 +1713,9 @@
> 	usleep(break_length * 1000);
> 	ioctl(s->ttyfd, TIOCCBRK, NULL);
> 	return 1;
>+#else
>+	return 0;
>+#endif
> }
> 
> static int
>Index: canohost.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/canohost.c,v
>retrieving revision 1.38
>diff -u -r1.38 canohost.c
>--- canohost.c	4 Jun 2003 23:52:42 -0000	1.38
>+++ canohost.c	5 Aug 2003 13:59:19 -0000
>@@ -159,6 +159,7 @@
> static void
> check_ip_options(int socket, char *ipaddr)
> {
>+#ifdef IP_OPTIONS
> 	u_char options[200];
> 	char text[sizeof(options) * 3 + 1];
> 	socklen_t option_size;
>@@ -181,6 +182,7 @@
> 		packet_disconnect("Connection from %.100s with IP options:%.800s",
> 		    ipaddr, text);
> 	}
>+#endif /* IP_OPTIONS */
> }
> 
> /*
>Index: openbsd-compat/bsd-misc.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/bsd-misc.h,v
>retrieving revision 1.9
>diff -u -r1.9 bsd-misc.h
>--- openbsd-compat/bsd-misc.h	2 Aug 2003 13:31:42 -0000	1.9
>+++ openbsd-compat/bsd-misc.h	5 Aug 2003 13:08:23 -0000
>@@ -93,4 +93,22 @@
> pid_t tcgetpgrp(int);
> #endif /* HAVE_TCGETPGRP */
> 
>+#ifndef CMSG_DATA
>+/* given pointer to struct cmsghdr, return pointer to data */
>+# define MY_ALIGN(p) (((u_int)(p) + (sizeof(int) - 1)) &~ (sizeof(int) - 1))
>+# define CMSG_DATA(cmsg) \
>+	((u_char *)(cmsg) + MY_ALIGN(sizeof(struct cmsghdr)))
>+#endif /* CMSG_DATA */
>+
>+#ifndef CMSG_FIRSTHDR
>+/*
>+ * RFC 2292 requires to check msg_controllen, in case that the kernel returns
>+ * an empty list for some reasons.
>+ */
>+# define CMSG_FIRSTHDR(mhdr) \
>+	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
>+	 (struct cmsghdr *)(mhdr)->msg_control : \
>+	 (struct cmsghdr *)NULL)
>+#endif /* CMSG_FIRSTHDR */
>+
> #endif /* _BSD_MISC_H */

Actions: View | Diff

Attachments on bug 336: 308 | 344 | 365