summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1996-12-27 08:42:41 +0000
committerPeter Wemm <peter@FreeBSD.org>1996-12-27 08:42:41 +0000
commit67faab29d61db98023ec4fa939b5ce5b4f294e69 (patch)
tree680520c4be61f37c5437f464ed0a0959b7c95e02
parentDon't need WRKSRC. (diff)
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>
Notes
Notes: svn path=/head/; revision=5106
-rw-r--r--security/ssh/files/patch-al3
-rw-r--r--security/ssh2/files/patch-al3
2 files changed, 4 insertions, 2 deletions
diff --git a/security/ssh/files/patch-al b/security/ssh/files/patch-al
index 4add2482628b..cdda2b13b478 100644
--- a/security/ssh/files/patch-al
+++ b/security/ssh/files/patch-al
@@ -2,11 +2,12 @@
--- sshconnect.c Mon Aug 12 13:26:46 1996
***************
*** 235,240 ****
---- 235,245 ----
+--- 235,246 ----
{
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));
diff --git a/security/ssh2/files/patch-al b/security/ssh2/files/patch-al
index 4add2482628b..cdda2b13b478 100644
--- a/security/ssh2/files/patch-al
+++ b/security/ssh2/files/patch-al
@@ -2,11 +2,12 @@
--- sshconnect.c Mon Aug 12 13:26:46 1996
***************
*** 235,240 ****
---- 235,245 ----
+--- 235,246 ----
{
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));