diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /dispatch.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dispatch.c b/dispatch.c index ce32bc22f..c5ff65031 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.15 2002/01/11 13:39:36 markus Exp $"); | 25 | RCSID("$OpenBSD: dispatch.c,v 1.16 2003/04/08 20:21:28 itojun Exp $"); |
26 | 26 | ||
27 | #include "ssh1.h" | 27 | #include "ssh1.h" |
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
@@ -39,7 +39,7 @@ dispatch_fn *dispatch[DISPATCH_MAX]; | |||
39 | void | 39 | void |
40 | dispatch_protocol_error(int type, u_int32_t seq, void *ctxt) | 40 | dispatch_protocol_error(int type, u_int32_t seq, void *ctxt) |
41 | { | 41 | { |
42 | log("dispatch_protocol_error: type %d seq %u", type, seq); | 42 | logit("dispatch_protocol_error: type %d seq %u", type, seq); |
43 | if (!compat20) | 43 | if (!compat20) |
44 | fatal("protocol error"); | 44 | fatal("protocol error"); |
45 | packet_start(SSH2_MSG_UNIMPLEMENTED); | 45 | packet_start(SSH2_MSG_UNIMPLEMENTED); |
@@ -50,7 +50,7 @@ dispatch_protocol_error(int type, u_int32_t seq, void *ctxt) | |||
50 | void | 50 | void |
51 | dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt) | 51 | dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt) |
52 | { | 52 | { |
53 | log("dispatch_protocol_ignore: type %d seq %u", type, seq); | 53 | logit("dispatch_protocol_ignore: type %d seq %u", type, seq); |
54 | } | 54 | } |
55 | void | 55 | void |
56 | dispatch_init(dispatch_fn *dflt) | 56 | dispatch_init(dispatch_fn *dflt) |