summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:26:35 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:26:35 +1100
commita009433333ccb10b30e840435755eccd1e3fefd6 (patch)
tree9347f8a8362006afe45806b34b476e4ce48fcaa9
parentf7475d7e97900323195b918942d0cf8d0489279f (diff)
- stevesk@cvs.openbsd.org 2008/11/01 06:43:33
[channels.c] fix some typos in log messages; ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--channels.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0063b10e1..2650f6b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,9 @@
86 [sshconnect2.c] 86 [sshconnect2.c]
87 sprinkle ARGSUSED on dispatch handlers 87 sprinkle ARGSUSED on dispatch handlers
88 nuke stale unusued prototype 88 nuke stale unusued prototype
89 - stevesk@cvs.openbsd.org 2008/11/01 06:43:33
90 [channels.c]
91 fix some typos in log messages; ok djm@
89 92
9020080906 9320080906
91 - (dtucker) [config.guess config.sub] Update to latest versions from 94 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4820,4 +4823,4 @@
4820 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4823 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4821 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4824 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4822 4825
4823$Id: ChangeLog,v 1.5119 2008/11/03 08:26:18 djm Exp $ 4826$Id: ChangeLog,v 1.5120 2008/11/03 08:26:35 djm Exp $
diff --git a/channels.c b/channels.c
index 69c99c9b2..4af7df5db 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.286 2008/07/16 11:52:19 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.287 2008/11/01 06:43:33 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -691,7 +691,7 @@ channel_register_open_confirm(int id, channel_callback_fn *fn, void *ctx)
691 Channel *c = channel_lookup(id); 691 Channel *c = channel_lookup(id);
692 692
693 if (c == NULL) { 693 if (c == NULL) {
694 logit("channel_register_open_comfirm: %d: bad id", id); 694 logit("channel_register_open_confirm: %d: bad id", id);
695 return; 695 return;
696 } 696 }
697 c->open_confirm = fn; 697 c->open_confirm = fn;
@@ -2385,10 +2385,10 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
2385 remote_id = packet_get_int(); 2385 remote_id = packet_get_int();
2386 packet_check_eom(); 2386 packet_check_eom();
2387 2387
2388 debug2("channel_input_confirm: type %d id %d", type, remote_id); 2388 debug2("channel_input_status_confirm: type %d id %d", type, remote_id);
2389 2389
2390 if ((c = channel_lookup(remote_id)) == NULL) { 2390 if ((c = channel_lookup(remote_id)) == NULL) {
2391 logit("channel_input_success_failure: %d: unknown", remote_id); 2391 logit("channel_input_status_confirm: %d: unknown", remote_id);
2392 return; 2392 return;
2393 } 2393 }
2394 ; 2394 ;