summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0002a182..d651601d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2002/06/11 23:03:54 3 - markus@cvs.openbsd.org 2002/06/11 23:03:54
4 [ssh.c] 4 [ssh.c]
5 remove unused cruft. 5 remove unused cruft.
6 - markus@cvs.openbsd.org 2002/06/12 01:09:52
7 [ssh.c]
8 ssh_connect returns 0 on success
6 9
720020611 1020020611
8 - (bal) ssh-agent.c RCSD fix (|unexpand already done) 11 - (bal) ssh-agent.c RCSD fix (|unexpand already done)
@@ -915,4 +918,4 @@
915 - (stevesk) entropy.c: typo in debug message 918 - (stevesk) entropy.c: typo in debug message
916 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 919 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
917 920
918$Id: ChangeLog,v 1.2212 2002/06/12 16:09:39 mouring Exp $ 921$Id: ChangeLog,v 1.2213 2002/06/12 16:11:12 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 06549afde..24ee54142 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.178 2002/06/11 23:03:54 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.179 2002/06/12 01:09:52 markus Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -620,7 +620,7 @@ again:
620#else 620#else
621 original_effective_uid == 0 && options.use_privileged_port, 621 original_effective_uid == 0 && options.use_privileged_port,
622#endif 622#endif
623 options.proxy_command) < 0) 623 options.proxy_command) != 0)
624 exit(1); 624 exit(1);
625 625
626 /* 626 /*