summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--clientloop.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a844cd472..652266e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,6 +125,10 @@
125 - djm@cvs.openbsd.org 2008/06/12 20:47:04 125 - djm@cvs.openbsd.org 2008/06/12 20:47:04
126 [sftp-client.c] 126 [sftp-client.c]
127 print extension revisions for extensions that we understand 127 print extension revisions for extensions that we understand
128 - djm@cvs.openbsd.org 2008/06/12 21:06:25
129 [clientloop.c]
130 I was coalescing expected global request confirmation replies at
131 the wrong end of the queue - fix; prompted by markus@
128 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now 132 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
129 takes 2 more args. with djm@ 133 takes 2 more args. with djm@
130 134
@@ -4289,4 +4293,4 @@
4289 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4293 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4290 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4294 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4291 4295
4292$Id: ChangeLog,v 1.4989 2008/06/12 21:01:29 dtucker Exp $ 4296$Id: ChangeLog,v 1.4990 2008/06/12 22:56:01 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index 62adbb78e..6dc870881 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.198 2008/06/12 15:19:17 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.199 2008/06/12 21:06:25 djm 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
@@ -745,7 +745,7 @@ client_register_global_confirm(global_confirm_cb *cb, void *ctx)
745 struct global_confirm *gc, *first_gc; 745 struct global_confirm *gc, *first_gc;
746 746
747 /* Coalesce identical callbacks */ 747 /* Coalesce identical callbacks */
748 first_gc = TAILQ_FIRST(&global_confirms); 748 first_gc = TAILQ_LAST(&global_confirms, global_confirms);
749 if (first_gc && first_gc->cb == cb && first_gc->ctx == ctx) { 749 if (first_gc && first_gc->cb == cb && first_gc->ctx == ctx) {
750 if (++first_gc->ref_count >= INT_MAX) 750 if (++first_gc->ref_count >= INT_MAX)
751 fatal("%s: first_gc->ref_count = %d", 751 fatal("%s: first_gc->ref_count = %d",