summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
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 82b40193d..71556e205 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.198 2003/07/22 13:35:22 markus Exp $"); 43RCSID("$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