| sshconnect2.c (126277) | sshconnect2.c (128460) |
|---|---|
| 1/* 2 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 9 unchanged lines hidden (view full) --- 18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 */ 24 25#include "includes.h" | 1/* 2 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions 6 * are met: 7 * 1. Redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer. --- 9 unchanged lines hidden (view full) --- 18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 */ 24 25#include "includes.h" |
| 26RCSID("$OpenBSD: sshconnect2.c,v 1.134 2004/01/19 21:25:15 markus Exp $"); | 26RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $"); |
| 27 28#include "openbsd-compat/sys-queue.h" 29 30#include "ssh.h" 31#include "ssh2.h" 32#include "xmalloc.h" 33#include "buffer.h" 34#include "packet.h" --- 1004 unchanged lines hidden (view full) --- 1039 xfree(comment); 1040 TAILQ_REMOVE(&files, id, next); 1041 TAILQ_INSERT_TAIL(preferred, id, next); 1042 id->ac = ac; 1043 found = 1; 1044 break; 1045 } 1046 } | 27 28#include "openbsd-compat/sys-queue.h" 29 30#include "ssh.h" 31#include "ssh2.h" 32#include "xmalloc.h" 33#include "buffer.h" 34#include "packet.h" --- 1004 unchanged lines hidden (view full) --- 1039 xfree(comment); 1040 TAILQ_REMOVE(&files, id, next); 1041 TAILQ_INSERT_TAIL(preferred, id, next); 1042 id->ac = ac; 1043 found = 1; 1044 break; 1045 } 1046 } |
| 1047 if (!found) { | 1047 if (!found && !options.identities_only) { |
| 1048 id = xmalloc(sizeof(*id)); 1049 memset(id, 0, sizeof(*id)); 1050 id->key = key; 1051 id->filename = comment; 1052 id->ac = ac; 1053 TAILQ_INSERT_TAIL(&agent, id, next); 1054 } 1055 } --- 429 unchanged lines hidden --- | 1048 id = xmalloc(sizeof(*id)); 1049 memset(id, 0, sizeof(*id)); 1050 id->key = key; 1051 id->filename = comment; 1052 id->ac = ac; 1053 TAILQ_INSERT_TAIL(&agent, id, next); 1054 } 1055 } --- 429 unchanged lines hidden --- |