upstream: fix debug message when finding a private key to match a

certificate being attempted for user authentication. Previously it would
print the certificate's path, whereas it was supposed to be showing the
private key's path. Patch from Alex Sherwin via GHPR247

OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b

diff --git a/sshconnect2.c b/sshconnect2.c
index 9b9a99b981bd0ffef94f295c2fe1a192010d5ba1..5ff90c46bd47fae8a073faa419787efdfbd4a249 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.348 2021/06/06 03:40:39 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.349 2021/06/07 03:38:38 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1382,8 +1382,8 @@ sign_and_send_pubkey(struct ssh *ssh, Identity *id)
                }
                if (sign_id != NULL) {
                        debug2_f("using private key \"%s\"%s for "
-                           "certificate", id->filename,
-                           id->agent_fd != -1 ? " from agent" : "");
+                           "certificate", sign_id->filename,
+                           sign_id->agent_fd != -1 ? " from agent" : "");
                } else {
                        debug_f("no separate private key for certificate "
                            "\"%s\"", id->filename);