diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-13 13:54:44 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-13 13:54:44 +1100 |
commit | 654c03fd064618e3577d098837108263f4e5457a (patch) | |
tree | 35c495694f06ca7e5ff663e4b9e351b4775fd7b0 | |
parent | 2ce18dabf3fff6c83dd555b0f7b92d9e949e9b66 (diff) |
- markus@cvs.openbsd.org 2002/02/11 16:17:55
[sshd.c]
do not complain about port > 1024 if rhosts-auth is disabled
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -7,6 +7,9 @@ | |||
7 | - markus@cvs.openbsd.org 2002/02/11 16:15:46 | 7 | - markus@cvs.openbsd.org 2002/02/11 16:15:46 |
8 | [sshconnect1.c] | 8 | [sshconnect1.c] |
9 | include md5.h, not evp.h | 9 | include md5.h, not evp.h |
10 | - markus@cvs.openbsd.org 2002/02/11 16:17:55 | ||
11 | [sshd.c] | ||
12 | do not complain about port > 1024 if rhosts-auth is disabled | ||
10 | 13 | ||
11 | 20020210 | 14 | 20020210 |
12 | - (djm) OpenBSD CVS Sync | 15 | - (djm) OpenBSD CVS Sync |
@@ -7554,4 +7557,4 @@ | |||
7554 | - Wrote replacements for strlcpy and mkdtemp | 7557 | - Wrote replacements for strlcpy and mkdtemp |
7555 | - Released 1.0pre1 | 7558 | - Released 1.0pre1 |
7556 | 7559 | ||
7557 | $Id: ChangeLog,v 1.1840 2002/02/13 02:54:27 djm Exp $ | 7560 | $Id: ChangeLog,v 1.1841 2002/02/13 02:54:44 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.224 2002/02/04 12:15:25 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.225 2002/02/11 16:17:55 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -1207,8 +1207,9 @@ main(int ac, char **av) | |||
1207 | * machine, he can connect from any port. So do not use these | 1207 | * machine, he can connect from any port. So do not use these |
1208 | * authentication methods from machines that you do not trust. | 1208 | * authentication methods from machines that you do not trust. |
1209 | */ | 1209 | */ |
1210 | if (remote_port >= IPPORT_RESERVED || | 1210 | if (options.rhosts_authentication && |
1211 | remote_port < IPPORT_RESERVED / 2) { | 1211 | (remote_port >= IPPORT_RESERVED || |
1212 | remote_port < IPPORT_RESERVED / 2)) { | ||
1212 | debug("Rhosts Authentication disabled, " | 1213 | debug("Rhosts Authentication disabled, " |
1213 | "originating port %d not trusted.", remote_port); | 1214 | "originating port %d not trusted.", remote_port); |
1214 | options.rhosts_authentication = 0; | 1215 | options.rhosts_authentication = 0; |