remove extra whitespace; fix link

[openssl.git] / apps / s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 28c6b1e27a0a78893666ac1cb2ad163feacde05e..cf43301df2b5798740d5a6cbadd5f7bdce993c22 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -172,7 +172,6 @@ static int ssl_sock_init(void)
 #ifdef WATT32
        extern int _watt_do_exit;
        _watt_do_exit = 0;
-       dbug_init();
        if (sock_init())
                return (0);
 #elif defined(OPENSSL_SYS_WINDOWS)
@@ -271,7 +270,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port)
        return(1);
        }
 
-int do_server(int port, int *ret, int (*cb)(), char *context)
+int do_server(int port, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), char *context)
        {
        int sock;
        char *name;
@@ -292,7 +291,7 @@ int do_server(int port, int *ret, int (*cb)(), char *context)
                        SHUTDOWN(accept_socket);
                        return(0);
                        }
-               i=(*cb)(name,sock, context);
+               i=(*cb)(name,sock, (unsigned char *)context);
                if (name != NULL) OPENSSL_free(name);
                SHUTDOWN2(sock);
                if (i < 0)