* 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).

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 @@
-/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1502,7 +1502,7 @@ pubkey_prepare(Authctxt *authctxt)
                 id = xcalloc(1, sizeof(*id));
                 id->key = key;
                 id->filename = xstrdup(options.identity_files[i]);
-                id->userprovided = 1;
+                id->userprovided = options.identity_file_userprovided[i];
                 TAILQ_INSERT_TAIL(&files, id, next);
         }
         /* Prefer PKCS11 keys that are explicitly listed */