2 files changed, 2 insertions, 20 deletions

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 58d57db281..ec28ba2e82 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.40 2014/06/22 15:38:28 jsing Exp $ */
+/* $OpenBSD: b_sock.c,v 1.41 2014/06/22 16:47:08 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -87,11 +87,6 @@ BIO_get_host_ip(const char *str, unsigned char *ip)
                 goto err;
         }
 
-        /* At this point, we have something that is most probably correct
-           in some way, so let's init the socket. */
-        if (BIO_sock_init() != 1)
-                return 0; /* don't generate another error code here */
-
         /* If the string actually contained an IP address, we need not do
            anything more */
         if (i > 0)
@@ -208,7 +203,6 @@ BIO_gethostbyname(const char *name)
         return gethostbyname(name);
 }
 
-
 int
 BIO_sock_init(void)
 {
@@ -286,9 +280,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
         unsigned long l;
         int err_num;
 
-        if (BIO_sock_init() != 1)
-                return (-1);
-
         if ((str = BUF_strdup(host)) == NULL)
                 return (-1);
 
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 58d57db281..ec28ba2e82 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.40 2014/06/22 15:38:28 jsing Exp $ */
+/* $OpenBSD: b_sock.c,v 1.41 2014/06/22 16:47:08 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -87,11 +87,6 @@ BIO_get_host_ip(const char *str, unsigned char *ip)
                 goto err;
         }
 
-        /* At this point, we have something that is most probably correct
-           in some way, so let's init the socket. */
-        if (BIO_sock_init() != 1)
-                return 0; /* don't generate another error code here */
-
         /* If the string actually contained an IP address, we need not do
            anything more */
         if (i > 0)
@@ -208,7 +203,6 @@ BIO_gethostbyname(const char *name)
         return gethostbyname(name);
 }
 
-
 int
 BIO_sock_init(void)
 {
@@ -286,9 +280,6 @@ BIO_get_accept_socket(char *host, int bind_mode)
         unsigned long l;
         int err_num;
 
-        if (BIO_sock_init() != 1)
-                return (-1);
-
         if ((str = BUF_strdup(host)) == NULL)
                 return (-1);