diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 13:50:50 +0100 |
commit | 328b60656f29db6306994d7498dede386ec2d1c3 (patch) | |
tree | 7d3a4fd1eb06c355e7122b89b408b51b0b9b6c9b /sshconnect2.c | |
parent | 91c1846f2f94bc944f5e8f53b9903cb59ca42adc (diff) | |
parent | 79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff) |
merge 6.2p2
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 8015b1bdf..1aa8523e1 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1500,7 +1500,7 @@ pubkey_prepare(Authctxt *authctxt) | |||
1500 | id = xcalloc(1, sizeof(*id)); | 1500 | id = xcalloc(1, sizeof(*id)); |
1501 | id->key = key; | 1501 | id->key = key; |
1502 | id->filename = xstrdup(options.identity_files[i]); | 1502 | id->filename = xstrdup(options.identity_files[i]); |
1503 | id->userprovided = 1; | 1503 | id->userprovided = options.identity_file_userprovided[i]; |
1504 | TAILQ_INSERT_TAIL(&files, id, next); | 1504 | TAILQ_INSERT_TAIL(&files, id, next); |
1505 | } | 1505 | } |
1506 | /* Prefer PKCS11 keys that are explicitly listed */ | 1506 | /* Prefer PKCS11 keys that are explicitly listed */ |