summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordtucker <dtucker>2003-08-13 10:37:05 +0000
committerdtucker <dtucker>2003-08-13 10:37:05 +0000
commit7a14b7cbb4b1d7ea716cc98e75601072484e4ca7 (patch)
treefeaaba6987d73d68de0069524742de8a98b806cf /ssh.c
parenta09cca484b19f6f890518d2d8f5f092c0bbeb42d (diff)
downloadopenssh-7a14b7cbb4b1d7ea716cc98e75601072484e4ca7.tar.gz
- 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.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/ssh.c b/ssh.c
index 82b40193..71556e20 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.198 2003/07/22 13:35:22 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.199 2003/08/13 08:46:30 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -600,19 +600,7 @@ again:
strcmp(options.proxy_command, "none") == 0)
options.proxy_command = NULL;
- /* Disable rhosts authentication if not running as root. */
-#ifdef HAVE_CYGWIN
- /* Ignore uid if running under Windows */
- if (!options.use_privileged_port) {
-#else
- if (original_effective_uid != 0 || !options.use_privileged_port) {
-#endif
- debug("Rhosts Authentication disabled, "
- "originating port will not be trusted.");
- options.rhosts_authentication = 0;
- }
/* Open a connection to the remote host. */
-
if (ssh_connect(host, &hostaddr, options.port,
options.address_family, options.connection_attempts,
#ifdef HAVE_CYGWIN