summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-11 20:28:05 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-11 20:28:05 +0000
commit1aa6427c0f0385fde48e3457a9ebf37b8de77d06 (patch)
treecafc81b488008599b6ecc64e60ef6e1e046c9d79
parent9a17c9a568904d08b3d1e01ff5fc78ebd060101c (diff)
- (bal) Cygwin fix up from swap uid clean up in ssh.c patch by
vinschen@redhat.com
-rw-r--r--ChangeLog4
-rw-r--r--ssh.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 202c8699..5cfd887d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@
- itojun@cvs.openbsd.org 2002/06/11 08:11:45
[canohost.c]
use "ntop" only after initialized
+ - (bal) Cygwin fix up from swap uid clean up in ssh.c patch by
+ vinschen@redhat.com
20020609
- (bal) OpenBSD CVS Sync
@@ -907,4 +909,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2210 2002/06/11 16:47:22 mouring Exp $
+$Id: ChangeLog,v 1.2211 2002/06/11 20:28:05 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 5693c0d3..be9c78b0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -615,7 +615,11 @@ again:
cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6,
options.connection_attempts,
+#ifdef HAVE_CYGWIN
+ options.use_privileged_port,
+#else
original_effective_uid == 0 && options.use_privileged_port,
+#endif
options.proxy_command);
/*