[openssh-commits] [openssh] 02/02: upstream: Fix incorrect error message when key certification fails

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit d88205417084f523107fbe1bc92061635cd57fd2
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Nov 18 06:39:36 2019 +0000

    upstream: Fix incorrect error message when key certification fails
    
    OpenBSD-Commit-ID: 7771bd77ee73f7116df37c734c41192943a73cee
---
 ssh-keygen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssh-keygen.c b/ssh-keygen.c
index d95415fb..356168fb 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.366 2019/11/18 06:24:17 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.367 2019/11/18 06:39:36 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1830,7 +1830,7 @@ do_ca_sign(struct passwd *pw, const char *ca_key_path, int prefer_agent,
 				fatal("Couldn't certify key %s via agent: %s",
 				    tmp, ssh_err(r));
 		} else {
-			if ((sshkey_certify(public, ca, key_type_name,
+			if ((r = sshkey_certify(public, ca, key_type_name,
 			    sk_provider)) != 0)
 				fatal("Couldn't certify key %s: %s",
 				    tmp, ssh_err(r));

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.