summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-04-20 20:07:19 +1000
committerDamien Miller <djm@mindrot.org>2004-04-20 20:07:19 +1000
commit0b51a52a103d346ea6eaf6e76aa0d9fa3b643d04 (patch)
tree355d1d15f47d1406b610b22fa8cd8f4f1982bcc8
parentbddc2b0179ea35da7269d025c8f690593bff54b6 (diff)
- (djm) OpenBSD CVS Sync
- henning@cvs.openbsd.org 2004/04/08 16:08:21 [sshconnect2.c] swap the last two parameters to TAILQ_FOREACH_REVERSE. matches what FreeBSD and NetBSD do. ok millert@ mcbride@ markus@ ho@, checked to not affect ports by naddy@
-rw-r--r--ChangeLog9
-rw-r--r--sshconnect2.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8468e06a3..4ba9f29d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120040420
2 - (djm) OpenBSD CVS Sync
3 - henning@cvs.openbsd.org 2004/04/08 16:08:21
4 [sshconnect2.c]
5 swap the last two parameters to TAILQ_FOREACH_REVERSE. matches what FreeBSD and NetBSD do.
6 ok millert@ mcbride@ markus@ ho@, checked to not affect ports by naddy@
7
120040419 820040419
2 - (dtucker) OpenBSD CVS Sync 9 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2004/02/29 22:04:45 10 - dtucker@cvs.openbsd.org 2004/02/29 22:04:45
@@ -1001,4 +1008,4 @@
1001 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1008 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1002 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1009 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1003 1010
1004$Id: ChangeLog,v 1.3321 2004/04/19 13:50:16 dtucker Exp $ 1011$Id: ChangeLog,v 1.3322 2004/04/20 10:07:19 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index c261dfd18..447642895 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $");
27 27
28#include "openbsd-compat/sys-queue.h" 28#include "openbsd-compat/sys-queue.h"
29 29
@@ -458,7 +458,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
458 * moved to the end of the queue. this also avoids confusion by 458 * moved to the end of the queue. this also avoids confusion by
459 * duplicate keys 459 * duplicate keys
460 */ 460 */
461 TAILQ_FOREACH_REVERSE(id, &authctxt->keys, next, idlist) { 461 TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) {
462 if (key_equal(key, id->key)) { 462 if (key_equal(key, id->key)) {
463 sent = sign_and_send_pubkey(authctxt, id); 463 sent = sign_and_send_pubkey(authctxt, id);
464 break; 464 break;