diff options
| author | Damien Miller <djm@mindrot.org> | 2007-09-17 12:06:57 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-09-17 12:06:57 +1000 |
| commit | 67bd062b27f87047ec48e9a0dd9a47eec2891973 (patch) | |
| tree | 1d2a2ca058f75e068707dfd82e093a7b80e57d3e /sshconnect.h | |
| parent | 54fd7cf2db5327f304825e0f9aaf9af5a490a75f (diff) | |
| download | openssh-git-67bd062b27f87047ec48e9a0dd9a47eec2891973.tar.gz | |
- djm@cvs.openbsd.org 2007/09/04 11:15:56
[ssh.c sshconnect.c sshconnect.h]
make ssh(1)'s ConnectTimeout option apply to both the TCP connection and
SSH banner exchange (previously it just covered the TCP connection).
This allows callers of ssh(1) to better detect and deal with stuck servers
that accept a TCP connection but don't progress the protocol, and also
makes ConnectTimeout useful for connections via a ProxyCommand;
feedback and "looks ok" markus@
Diffstat (limited to 'sshconnect.h')
| -rw-r--r-- | sshconnect.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.h b/sshconnect.h index 4e66bbff..75bde1a4 100644 --- a/sshconnect.h +++ b/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.24 2007/09/04 11:15:56 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -33,10 +33,10 @@ struct Sensitive { int ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int, - int, const char *); + int *, int, int, const char *); void -ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *); +ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int); int verify_host_key(char *, struct sockaddr *, Key *); |