diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-agent.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -38,6 +38,10 @@ | |||
38 | - djm@cvs.openbsd.org 2004/10/07 10:10:24 | 38 | - djm@cvs.openbsd.org 2004/10/07 10:10:24 |
39 | [scp.1 sftp.1 ssh.1 ssh_config.5] | 39 | [scp.1 sftp.1 ssh.1 ssh_config.5] |
40 | document KbdInteractiveDevices; ok markus@ | 40 | document KbdInteractiveDevices; ok markus@ |
41 | - djm@cvs.openbsd.org 2004/10/07 10:12:36 | ||
42 | [ssh-agent.c] | ||
43 | don't unlink agent socket when bind() fails, spotted by rich AT | ||
44 | rich-paul.net, ok markus@ | ||
41 | 45 | ||
42 | 20041102 | 46 | 20041102 |
43 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX | 47 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX |
@@ -1817,4 +1821,4 @@ | |||
1817 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1821 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1818 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1822 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1819 | 1823 | ||
1820 | $Id: ChangeLog,v 1.3572 2004/11/05 09:22:00 dtucker Exp $ | 1824 | $Id: ChangeLog,v 1.3573 2004/11/05 09:26:49 dtucker Exp $ |
diff --git a/ssh-agent.c b/ssh-agent.c index 7bc4c240e..fffed1342 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.120 2004/08/11 21:43:05 avsm Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.121 2004/10/07 10:12:36 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -1122,6 +1122,7 @@ main(int ac, char **av) | |||
1122 | sock = socket(AF_UNIX, SOCK_STREAM, 0); | 1122 | sock = socket(AF_UNIX, SOCK_STREAM, 0); |
1123 | if (sock < 0) { | 1123 | if (sock < 0) { |
1124 | perror("socket"); | 1124 | perror("socket"); |
1125 | *socket_name = '\0'; /* Don't unlink any existing file */ | ||
1125 | cleanup_exit(1); | 1126 | cleanup_exit(1); |
1126 | } | 1127 | } |
1127 | memset(&sunaddr, 0, sizeof(sunaddr)); | 1128 | memset(&sunaddr, 0, sizeof(sunaddr)); |
@@ -1130,6 +1131,7 @@ main(int ac, char **av) | |||
1130 | prev_mask = umask(0177); | 1131 | prev_mask = umask(0177); |
1131 | if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { | 1132 | if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { |
1132 | perror("bind"); | 1133 | perror("bind"); |
1134 | *socket_name = '\0'; /* Don't unlink any existing file */ | ||
1133 | umask(prev_mask); | 1135 | umask(prev_mask); |
1134 | cleanup_exit(1); | 1136 | cleanup_exit(1); |
1135 | } | 1137 | } |