[Nagiosplug-checkins] CVS: nagiosplug/plugins check_tcp.c,1.41,1.42

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3343

Modified Files:
	check_tcp.c 
Log Message:
Enhance SSL initialization problems (Phil Dibowitz - 1055120)


Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** check_tcp.c	17 Nov 2004 23:35:08 -0000	1.41
--- check_tcp.c	18 Nov 2004 22:42:17 -0000	1.42
***************
*** 530,535 ****
    /* Initialize SSL context */
    SSLeay_add_ssl_algorithms ();
!   meth = SSLv2_client_method ();
    SSL_load_error_strings ();
    if ((ctx = SSL_CTX_new (meth)) == NULL)
      {
--- 530,536 ----
    /* Initialize SSL context */
    SSLeay_add_ssl_algorithms ();
!   meth = SSLv23_client_method ();
    SSL_load_error_strings ();
+   OpenSSL_add_all_algorithms();
    if ((ctx = SSL_CTX_new (meth)) == NULL)
      {
***************
*** 554,558 ****
        {
          SSL_set_fd (ssl, sd);
!         if (SSL_connect (ssl) != -1)
            return OK;
          ERR_print_errors_fp (stderr);
--- 555,559 ----
        {
          SSL_set_fd (ssl, sd);
!         if (SSL_connect(ssl) == 1)
            return OK;
          ERR_print_errors_fp (stderr);