[Nagiosplug-checkins] CVS: nagiosplug/plugins check_dns.c,1.16,1.17

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv10441

Modified Files:
	check_dns.c 
Log Message:
terminate in error_scan() so meaningfull errors can be sent


Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** check_dns.c	1 Aug 2003 06:03:36 -0000	1.16
--- check_dns.c	1 Aug 2003 23:56:03 -0000	1.17
***************
*** 271,314 ****
  	/* the DNS lookup timed out */
  	else if (strstr (input_buffer, "Timed out"))
! 		return STATE_WARNING;
  
  	/* DNS server is not running... */
  	else if (strstr (input_buffer, "No response from server"))
! 		return STATE_CRITICAL;
  
  	/* Host name is valid, but server doesn't have records... */
  	else if (strstr (input_buffer, "No records"))
! 		return STATE_WARNING;
! 
! 	/* Host or domain name does not exist */
! 	else if (strstr (input_buffer, "Non-existent"))
! 		return STATE_CRITICAL;
! 	else if (strstr (input_buffer, "** server can't find"))
! 		return STATE_CRITICAL;
! 	else if(strstr(input_buffer,"NXDOMAIN")) /* 9.x */
! 		return STATE_CRITICAL;
  
  	/* Connection was refused */
! 	else if (strstr (input_buffer, "Connection refused"))
! 		return STATE_CRITICAL;
  
  	/* Network is unreachable */
  	else if (strstr (input_buffer, "Network is unreachable"))
! 		return STATE_CRITICAL;
  
  	/* Internal server failure */
  	else if (strstr (input_buffer, "Server failure"))
! 		return STATE_CRITICAL;
! 
! 	/* DNS server refused to service request */
! 	else if (strstr (input_buffer, "Refused"))
! 		return STATE_CRITICAL;
  
  	/* Request error */
  	else if (strstr (input_buffer, "Format error"))
! 		return STATE_WARNING;
  
! 	else
! 		return STATE_OK;
  
  }
--- 271,310 ----
  	/* the DNS lookup timed out */
  	else if (strstr (input_buffer, "Timed out"))
! 		terminate (STATE_WARNING, "Request timed out at server\n");
  
  	/* DNS server is not running... */
  	else if (strstr (input_buffer, "No response from server"))
! 		terminate (STATE_CRITICAL, "No response from name server %s\n", dns_server);
  
  	/* Host name is valid, but server doesn't have records... */
  	else if (strstr (input_buffer, "No records"))
! 		terminate (STATE_CRITICAL, "Name server %s has no records\n", dns_server);
  
  	/* Connection was refused */
! 	else if (strstr (input_buffer, "Connection refused") ||
! 	         (strstr (input_buffer, "** server can't find") &&
! 	          strstr (input_buffer, ": REFUSED")) ||
! 	         (strstr (input_buffer, "Refused")))
! 		terminate (STATE_CRITICAL, "Connection to name server %s was refused\n", dns_server);
! 
! 	/* Host or domain name does not exist */
! 	else if (strstr (input_buffer, "Non-existent") ||
! 	         strstr (input_buffer, "** server can't find") ||
! 	         strstr (input_buffer,"NXDOMAIN"))
! 		terminate (STATE_CRITICAL, "Domain %s was not found by the server\n", query_address);
  
  	/* Network is unreachable */
  	else if (strstr (input_buffer, "Network is unreachable"))
! 		terminate (STATE_CRITICAL, "Network is unreachable\n");
  
  	/* Internal server failure */
  	else if (strstr (input_buffer, "Server failure"))
! 		terminate (STATE_CRITICAL, "Server failure for %s\n", dns_server);
  
  	/* Request error */
  	else if (strstr (input_buffer, "Format error"))
! 		terminate (STATE_WARNING, "Format error\n");
  
! 	return STATE_OK;
  
  }