freebsd-ports/security/ssh/files/patch-al

*** sshconnect.c.orig	Sun Apr  6 03:57:04 1997
--- sshconnect.c	Wed Apr 16 23:04:17 1997
***************
*** 302,307 ****
--- 302,313 ----
      {
        struct sockaddr_in sin;
        int p;
+ #if defined(__FreeBSD__)  && !defined(SOCKS)
+ 	p = 1023;	/* Compat with old FreeBSD */
+       sock = rresvport(&p);
+       if (sock < 0)
+ 	fatal("rresvport: %.100s", strerror(errno));
+ #else
        for (p = 1023; p > 512; p--)
  	{
  	  sock = socket(AF_INET, SOCK_STREAM, 0);
***************
*** 329,334 ****
--- 335,341 ----
  	    }
  	  fatal("bind: %.100s", strerror(errno));
  	}
+ #endif
        debug("Allocated local port %d.", p);
      }
    else
Upgrade to 1.2.19 1997-04-16 19:48:30 +00:00			`*** sshconnect.c.orig Sun Apr 6 03:57:04 1997`
			`--- sshconnect.c Wed Apr 16 23:04:17 1997`
Have ssh use rresvport() to get a privileged socket instead of doing it itself. This means it obeys the portrange sysctl's. 1996-08-12 14:17:53 +00:00			`***************`
Upgrade to 1.2.19 1997-04-16 19:48:30 +00:00			`* 302,307 **`
			`--- 302,313 ----`
Have ssh use rresvport() to get a privileged socket instead of doing it itself. This means it obeys the portrange sysctl's. 1996-08-12 14:17:53 +00:00			`{`
			`struct sockaddr_in sin;`
			`int p;`
			`+ #if defined(__FreeBSD__) && !defined(SOCKS)`
Make one of our changes for -current work on 2.1. In -current, rresvport() ignores it's argument (it's meaningless, the kernel keeps the state), but 2.1.x use it. ssh was effectively giving a random port to 2.1. Originally noticed by: John Polstra <jdp@polstra.com> 1996-12-27 08:42:41 +00:00			`+ p = 1023; /* Compat with old FreeBSD */`
Have ssh use rresvport() to get a privileged socket instead of doing it itself. This means it obeys the portrange sysctl's. 1996-08-12 14:17:53 +00:00			`+ sock = rresvport(&p);`
			`+ if (sock < 0)`
			`+ fatal("rresvport: %.100s", strerror(errno));`
			`+ #else`
			`for (p = 1023; p > 512; p--)`
			`{`
			`sock = socket(AF_INET, SOCK_STREAM, 0);`
			`***************`
Upgrade to 1.2.19 1997-04-16 19:48:30 +00:00			`* 329,334 **`
			`--- 335,341 ----`
Have ssh use rresvport() to get a privileged socket instead of doing it itself. This means it obeys the portrange sysctl's. 1996-08-12 14:17:53 +00:00			`}`
			`fatal("bind: %.100s", strerror(errno));`
			`}`
			`+ #endif`
			`debug("Allocated local port %d.", p);`
			`}`
			`else`