diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
commit | 031d51614426a5d5ad42f971831df373f5d6e6d8 (patch) | |
tree | 6a66dc70fd3444ea8064f25256bd2fccdce6e3cd /sshconnect2.c | |
parent | 43587d4ea4349c7b98edcde117f37e6ca2e1b674 (diff) | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2p2):
- Only warn for missing identity files that were explicitly specified
(closes: #708275).
- Fix bug in contributed contrib/ssh-copy-id script that could result in
"rm *" being called on mktemp failure (closes: #708419).
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 378b3200c..77b02e3bf 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. |
@@ -1502,7 +1502,7 @@ pubkey_prepare(Authctxt *authctxt) | |||
1502 | id = xcalloc(1, sizeof(*id)); | 1502 | id = xcalloc(1, sizeof(*id)); |
1503 | id->key = key; | 1503 | id->key = key; |
1504 | id->filename = xstrdup(options.identity_files[i]); | 1504 | id->filename = xstrdup(options.identity_files[i]); |
1505 | id->userprovided = 1; | 1505 | id->userprovided = options.identity_file_userprovided[i]; |
1506 | TAILQ_INSERT_TAIL(&files, id, next); | 1506 | TAILQ_INSERT_TAIL(&files, id, next); |
1507 | } | 1507 | } |
1508 | /* Prefer PKCS11 keys that are explicitly listed */ | 1508 | /* Prefer PKCS11 keys that are explicitly listed */ |