[Nagios-checkins] nrpe/src check_nrpe.c,1.34,1.35 nrpe.c,1.44,1.45

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nrpe/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24169/src

Modified Files:
	check_nrpe.c nrpe.c 
Log Message:
Fix for SSL errors on Solaris 8

Index: check_nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/check_nrpe.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** check_nrpe.c	28 Feb 2006 18:14:13 -0000	1.34
--- check_nrpe.c	21 Mar 2006 21:46:27 -0000	1.35
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 02-28-2006
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 03-21-2006
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]

Index: nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/nrpe.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** nrpe.c	28 Feb 2006 18:14:13 -0000	1.44
--- nrpe.c	21 Mar 2006 21:46:27 -0000	1.45
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 02-28-2006
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 03-21-2006
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
***************
*** 975,979 ****
  		if((ssl=SSL_new(ctx))!=NULL){
  			SSL_set_fd(ssl,sock);
! 			if((rc=SSL_accept(ssl))!=1){
  				syslog(LOG_ERR,"Error: Could not complete SSL handshake. %d\n",SSL_get_error(ssl,rc));
  #ifdef DEBUG
--- 975,983 ----
  		if((ssl=SSL_new(ctx))!=NULL){
  			SSL_set_fd(ssl,sock);
! 
! 			/* keep attempting the request if needed */
!                         while(((rc=SSL_accept(ssl))!=1) && (SSL_get_error(ssl,rc)==SSL_ERROR_WANT_READ));
! 
! 			if(rc!=1){
  				syslog(LOG_ERR,"Error: Could not complete SSL handshake. %d\n",SSL_get_error(ssl,rc));
  #ifdef DEBUG
***************
*** 1001,1006 ****
  		rc=recvall(sock,(char *)&receive_packet,&bytes_to_recv,socket_timeout);
  #ifdef HAVE_SSL
! 	else
! 		rc=SSL_read(ssl,&receive_packet,bytes_to_recv);
  #endif
  
--- 1005,1011 ----
  		rc=recvall(sock,(char *)&receive_packet,&bytes_to_recv,socket_timeout);
  #ifdef HAVE_SSL
! 	else{
!                 while(((rc=SSL_read(ssl,&receive_packet,bytes_to_recv))<=0) && (SSL_get_error(ssl,rc)==SSL_ERROR_WANT_READ));
! 		}
  #endif