diff options
author | Colin Watson <cjwatson@debian.org> | 2017-04-02 01:26:17 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-04-02 01:54:08 +0100 |
commit | 20adc7e0fc13ff9c7d270db250aac1fa140e3851 (patch) | |
tree | 5d9f06b0ff195db88093037d9102f0cdcf3884c6 /sshconnect.c | |
parent | af27669f905133925224acc753067dea710881dd (diff) | |
parent | ec338656a3d6b21bb87f3b6367b232d297f601e5 (diff) |
New upstream release (7.5p1)
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index c64c51bbb..120f09458 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.272 2016/09/12 01:22:38 deraadt Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.273 2017/03/10 03:22:40 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1538,6 +1538,7 @@ maybe_add_key_to_agent(char *authfile, Key *private, char *comment, | |||
1538 | if (options.add_keys_to_agent == 2 && | 1538 | if (options.add_keys_to_agent == 2 && |
1539 | !ask_permission("Add key %s (%s) to agent?", authfile, comment)) { | 1539 | !ask_permission("Add key %s (%s) to agent?", authfile, comment)) { |
1540 | debug3("user denied adding this key"); | 1540 | debug3("user denied adding this key"); |
1541 | close(auth_sock); | ||
1541 | return; | 1542 | return; |
1542 | } | 1543 | } |
1543 | 1544 | ||
@@ -1546,4 +1547,5 @@ maybe_add_key_to_agent(char *authfile, Key *private, char *comment, | |||
1546 | debug("identity added to agent: %s", authfile); | 1547 | debug("identity added to agent: %s", authfile); |
1547 | else | 1548 | else |
1548 | debug("could not add identity to agent: %s (%d)", authfile, r); | 1549 | debug("could not add identity to agent: %s (%d)", authfile, r); |
1550 | close(auth_sock); | ||
1549 | } | 1551 | } |