diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-08-13 20:37:05 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-13 20:37:05 +1000 |
commit | ec960f2c933aa55ca5dc319cff55cecce34f1f4b (patch) | |
tree | 9b684c910ef3e2fc2253003c6353334969405871 /ssh.c | |
parent | 3bdbd848ea86c27a65ee766fd2c9d9158dadb381 (diff) |
- markus@cvs.openbsd.org 2003/08/13 08:46:31
[auth1.c readconf.c readconf.h servconf.c servconf.h ssh.c ssh_config
ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5]
remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@,
fgsch@, miod@, henning@, jakob@ and others
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.198 2003/07/22 13:35:22 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.199 2003/08/13 08:46:30 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -600,19 +600,7 @@ again: | |||
600 | strcmp(options.proxy_command, "none") == 0) | 600 | strcmp(options.proxy_command, "none") == 0) |
601 | options.proxy_command = NULL; | 601 | options.proxy_command = NULL; |
602 | 602 | ||
603 | /* Disable rhosts authentication if not running as root. */ | ||
604 | #ifdef HAVE_CYGWIN | ||
605 | /* Ignore uid if running under Windows */ | ||
606 | if (!options.use_privileged_port) { | ||
607 | #else | ||
608 | if (original_effective_uid != 0 || !options.use_privileged_port) { | ||
609 | #endif | ||
610 | debug("Rhosts Authentication disabled, " | ||
611 | "originating port will not be trusted."); | ||
612 | options.rhosts_authentication = 0; | ||
613 | } | ||
614 | /* Open a connection to the remote host. */ | 603 | /* Open a connection to the remote host. */ |
615 | |||
616 | if (ssh_connect(host, &hostaddr, options.port, | 604 | if (ssh_connect(host, &hostaddr, options.port, |
617 | options.address_family, options.connection_attempts, | 605 | options.address_family, options.connection_attempts, |
618 | #ifdef HAVE_CYGWIN | 606 | #ifdef HAVE_CYGWIN |