[openssh-commits] [openssh] 01/01: upstream commit

[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 1a321bfdb91defe3c4d9cca5651724ae167e5436
Author: deraadt at openbsd.org <deraadt at openbsd.org>
Date:   Wed Mar 15 03:52:30 2017 +0000

    upstream commit
    
    accidents happen to the best of us; ok djm
    
    Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604
---
 ssh-agent.c | 3 ++-
 sshd.c      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ssh-agent.c b/ssh-agent.c
index 72d538e..b987562 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.217 2017/03/15 02:25:09 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.218 2017/03/15 03:52:30 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -857,6 +857,7 @@ process_remove_smartcard_key(SocketEntry *e)
 	else
 		error("process_remove_smartcard_key:"
 		    " pkcs11_del_provider failed");
+send:
 	free(provider);
 	send_status(e, success);
 }
diff --git a/sshd.c b/sshd.c
index 0b544f9..010a2c3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.484 2017/03/15 02:19:09 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.485 2017/03/15 03:52:30 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1679,7 +1679,7 @@ main(int ac, char **av)
 		if ((pubkey != NULL && pubkey->type == KEY_RSA1) ||
 		    (key != NULL && key->type == KEY_RSA1)) {
 			verbose("Ignoring RSA1 key %s",
-			    options.host_key_files[i])
+			    options.host_key_files[i]);
 			key_free(key);
 			key_free(pubkey);
 			continue;

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