diff options
author | Damien Miller <djm@mindrot.org> | 2001-02-19 21:51:08 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-02-19 21:51:08 +1100 |
commit | 225736c73acf19a3319104fe54cd9ce595924134 (patch) | |
tree | 386798cff0e4232c5dc0958b5293f7fd7e625d8e /dispatch.c | |
parent | ccdefb600f9d279cd17cdca79b241a036b380b21 (diff) |
- OpenBSD CVS Sync:
- reinhard@cvs.openbsd.org 2001/02/17 08:24:40
[sftp.1]
typo
- deraadt@cvs.openbsd.org 2001/02/17 16:28:58
[ssh.c]
cleanup -V output; noted by millert
- deraadt@cvs.openbsd.org 2001/02/17 16:48:48
[sshd.8]
it's the OpenSSH one
- markus@cvs.openbsd.org 2001/02/18 11:33:54
[dispatch.c]
typo, SSH2_MSG_KEXINIT, from aspa@kronodoc.fi
- markus@cvs.openbsd.org 2001/02/19 02:53:32
[compat.c compat.h serverloop.c]
ssh-1.2.{18-22} has broken handling of ignore messages; report from
itojun@
- markus@cvs.openbsd.org 2001/02/19 03:35:23
[version.h]
OpenSSH_2.5.1 adds bug compat with 1.2.{18-22}
- deraadt@cvs.openbsd.org 2001/02/19 03:36:25
[scp.c]
np is changed by recursion; vinschen@redhat.com
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dispatch.c b/dispatch.c index f0437cdee..7168d1c74 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: dispatch.c,v 1.9 2001/02/04 15:32:23 stevesk Exp $"); | 25 | RCSID("$OpenBSD: dispatch.c,v 1.10 2001/02/18 18:33:53 markus Exp $"); |
26 | 26 | ||
27 | #include "ssh1.h" | 27 | #include "ssh1.h" |
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
@@ -40,7 +40,7 @@ void | |||
40 | dispatch_protocol_error(int type, int plen, void *ctxt) | 40 | dispatch_protocol_error(int type, int plen, void *ctxt) |
41 | { | 41 | { |
42 | error("Hm, dispatch protocol error: type %d plen %d", type, plen); | 42 | error("Hm, dispatch protocol error: type %d plen %d", type, plen); |
43 | if (compat20 && type == SSH2_MSG_KEXDH_INIT) | 43 | if (compat20 && type == SSH2_MSG_KEXINIT) |
44 | fatal("dispatch_protocol_error: rekeying is not supported"); | 44 | fatal("dispatch_protocol_error: rekeying is not supported"); |
45 | } | 45 | } |
46 | void | 46 | void |