summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-04 16:33:31 +1000
committerDamien Miller <djm@mindrot.org>2002-09-04 16:33:31 +1000
commit061d5b144f7aaa9ce86838d437790b8e3a46050c (patch)
tree8d432b019d808ecba0a6bf7ede760c77e59223cc
parent066928648b11cc1ee02aca138853f17b3b6cf2f6 (diff)
- stevesk@cvs.openbsd.org 2002/08/22 20:57:19
[ssh-agent.c] shutdown(SHUT_RDWR) not needed before close here; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d6dc245d..1c00c95ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 [clientloop.c] 20 [clientloop.c]
21 format with current EscapeChar; bugzilla #388 from wknox@mitre.org. 21 format with current EscapeChar; bugzilla #388 from wknox@mitre.org.
22 ok markus@ 22 ok markus@
23 - stevesk@cvs.openbsd.org 2002/08/22 20:57:19
24 [ssh-agent.c]
25 shutdown(SHUT_RDWR) not needed before close here; ok markus@
23 26
2420020820 2720020820
25 - OpenBSD CVS Sync 28 - OpenBSD CVS Sync
@@ -1561,4 +1564,4 @@
1561 - (stevesk) entropy.c: typo in debug message 1564 - (stevesk) entropy.c: typo in debug message
1562 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1565 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1563 1566
1564$Id: ChangeLog,v 1.2432 2002/09/04 06:32:10 djm Exp $ 1567$Id: ChangeLog,v 1.2433 2002/09/04 06:33:31 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index cdc236d99..0bfef4dce 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/fake-queue.h" 37#include "openbsd-compat/fake-queue.h"
38RCSID("$OpenBSD: ssh-agent.c,v 1.101 2002/08/22 19:27:53 stevesk Exp $"); 38RCSID("$OpenBSD: ssh-agent.c,v 1.102 2002/08/22 20:57:19 stevesk Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41#include <openssl/md5.h> 41#include <openssl/md5.h>
@@ -109,7 +109,6 @@ char *__progname;
109static void 109static void
110close_socket(SocketEntry *e) 110close_socket(SocketEntry *e)
111{ 111{
112 shutdown(e->fd, SHUT_RDWR);
113 close(e->fd); 112 close(e->fd);
114 e->fd = -1; 113 e->fd = -1;
115 e->type = AUTH_UNUSED; 114 e->type = AUTH_UNUSED;