diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-15 03:52:31 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-15 03:52:31 +0000 |
| commit | e191e4ca3428574dfb2a2a7a24c8609fe8385da5 (patch) | |
| tree | 5bacd51adebd7119861e4a308d395e4175156290 /usr.bin/ssh | |
| parent | 2f0f647ef1878bd56b1cdb996b8d360977494b25 (diff) | |
accidents happen to the best of us; ok djm
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 404dd4edcc8..75276c86400 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/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@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -844,6 +844,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/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 2d764809b82..6cb0cf1fb39 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1555,7 +1555,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; |