From 1cb940c44a10a3c2a4feaa9d71691a962619ca94 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 10 Apr 2015 10:41:14 +0200
Subject: [PATCH] socket: Cleanup ssh_socket_close() code.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/socket.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/socket.c b/src/socket.c
index aa9c4579..022c9a76 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -425,17 +425,18 @@ int ssh_socket_unix(ssh_socket s, const char *path) {
 void ssh_socket_close(ssh_socket s){
   if (ssh_socket_is_open(s)) {
 #ifdef _WIN32
-    closesocket(s->fd_in);
+    CLOSE_SOCKET(s->fd_in);
     /* fd_in = fd_out under win32 */
     s->last_errno = WSAGetLastError();
 #else
-    close(s->fd_in);
-    if(s->fd_out != s->fd_in && s->fd_out != -1)
-      close(s->fd_out);
+    if (s->fd_out != s->fd_in && s->fd_out != -1) {
+        CLOSE_SOCKET(s->fd_out);
+    }
+    CLOSE_SOCKET(s->fd_in);
     s->last_errno = errno;
 #endif
-    s->fd_in = s->fd_out = SSH_INVALID_SOCKET;
   }
+
   if(s->poll_in != NULL){
     if(s->poll_out == s->poll_in)
       s->poll_out = NULL;