Resolved 1.21pre merge conflicts

git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/trunk@125 f02b47b9-160a-0410-81a6-dc3441afb0ec

1 files changed, 1 insertions, 1 deletions

diff --git a/src/ssl.c b/src/ssl.c
index 9f5b341..19b9828 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -257,7 +257,7 @@ int close_sock(int socket)
 		socket = sec_channel[socket].fd;
 	}
 
-	ret= close(socket);
+	ret= close(get_real_fd(socket));
 
 	if (ssl)
 		SSL_free (ssl);