diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-03-10 03:22:40 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2017-03-10 15:25:11 +1100 |
| commit | 566b3a46e89a2fda2db46f04f2639e92da64a120 (patch) | |
| tree | 84cd352993e4670a6101e6bc92eb1a8bb39a22b6 | |
| parent | 8a2834454c73dfc1eb96453c0e97690595f3f4c2 (diff) | |
upstream commit
Plug descriptor leaks of auth_sock. From jjelen at
redhat.com via bz#2687, ok djm@
Upstream-ID: 248acb99a5ed2fdca37d1aa33c0fcee7be286d88
| -rw-r--r-- | sshconnect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index 96b91ce1..948b638a 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.272 2016/09/12 01:22:38 deraadt Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.273 2017/03/10 03:22:40 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1532,6 +1532,7 @@ maybe_add_key_to_agent(char *authfile, Key *private, char *comment, if (options.add_keys_to_agent == 2 && !ask_permission("Add key %s (%s) to agent?", authfile, comment)) { debug3("user denied adding this key"); + close(auth_sock); return; } @@ -1540,4 +1541,5 @@ maybe_add_key_to_agent(char *authfile, Key *private, char *comment, debug("identity added to agent: %s", authfile); else debug("could not add identity to agent: %s (%d)", authfile, r); + close(auth_sock); } |