=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/clientloop.c,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- src/usr.bin/ssh/clientloop.c 2008/07/10 18:08:11 1.200 +++ src/usr.bin/ssh/clientloop.c 2008/07/16 11:51:14 1.201 @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.200 2008/07/10 18:08:11 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.201 2008/07/16 11:51:14 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -732,14 +732,14 @@ void client_register_global_confirm(global_confirm_cb *cb, void *ctx) { - struct global_confirm *gc, *first_gc; + struct global_confirm *gc, *last_gc; /* Coalesce identical callbacks */ - first_gc = TAILQ_LAST(&global_confirms, global_confirms); - if (first_gc && first_gc->cb == cb && first_gc->ctx == ctx) { - if (++first_gc->ref_count >= INT_MAX) - fatal("%s: first_gc->ref_count = %d", - __func__, first_gc->ref_count); + last_gc = TAILQ_LAST(&global_confirms, global_confirms); + if (last_gc && last_gc->cb == cb && last_gc->ctx == ctx) { + if (++last_gc->ref_count >= INT_MAX) + fatal("%s: last_gc->ref_count = %d", + __func__, last_gc->ref_count); return; }