diff options
| author | bket@openbsd.org <bket@openbsd.org> | 2020-06-27 13:39:09 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-07-03 15:12:31 +1000 |
| commit | e1c401109b61f7dbc199b5099933d579e7fc5dc9 (patch) | |
| tree | 9d3afb26fdc72482e25b04377caaddec54e8f84e /sshconnect2.c | |
| parent | 14beca57ac92d62830c42444c26ba861812dc837 (diff) | |
| download | openssh-git-e1c401109b61f7dbc199b5099933d579e7fc5dc9.tar.gz | |
upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT
OK djm@
OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 821af215..74946da0 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.323 2020/06/05 03:24:16 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.324 2020/06/27 13:39:09 bket Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1671,10 +1671,7 @@ pubkey_prepare(Authctxt *authctxt) } ssh_free_identitylist(idlist); /* append remaining agent keys */ - for (id = TAILQ_FIRST(&agent); id; id = TAILQ_FIRST(&agent)) { - TAILQ_REMOVE(&agent, id, next); - TAILQ_INSERT_TAIL(preferred, id, next); - } + TAILQ_CONCAT(preferred, &agent, next); authctxt->agent_fd = agent_fd; } /* Prefer PKCS11 keys that are explicitly listed */ @@ -1700,10 +1697,7 @@ pubkey_prepare(Authctxt *authctxt) } } /* append remaining keys from the config file */ - for (id = TAILQ_FIRST(&files); id; id = TAILQ_FIRST(&files)) { - TAILQ_REMOVE(&files, id, next); - TAILQ_INSERT_TAIL(preferred, id, next); - } + TAILQ_CONCAT(preferred, &files, next); /* finally, filter by PubkeyAcceptedKeyTypes */ TAILQ_FOREACH_SAFE(id, preferred, next, id2) { if (id->key != NULL && !key_type_allowed_by_config(id->key)) { |