[Nagiosplug-checkins] CVS: nagiosplug/plugins check_by_ssh.c,1.13,1.14 check_disk.c,1.29,1.30 check_dns.c,1.18,1.19 check_fping.c,1.7,1.8 check_game.c,1.5,1.6 check_http.c,1.39,1.40 check_mrtg.c,1.6,1.7 check_mrtgtraf.c,1.6,1.7 check_nagios.c,1.8,1.9 check_nt.c,1.12,1.13 check_nwstat.c,1.9,1.10 check_overcr.c,1.4,1.5 check_radius.c,1.6,1.7 check_real.c,1.7,1.8 check_snmp.c,1.30,1.31 check_swap.c,1.15,1.16 check_tcp.c,1.32,1.33 check_time.c,1.6,1.7 negate.c,1.10,1.11 netutils.c,1.11,1.12 popen.c,1.4,1.5 utils.c,1.26,1.27 utils.h,1.9,1.10

Karl DeBisschop kdebisschop at users.sourceforge.net
Thu Aug 7 04:52:02 CEST 2003


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

Modified Files:
	check_by_ssh.c check_disk.c check_dns.c check_fping.c 
	check_game.c check_http.c check_mrtg.c check_mrtgtraf.c 
	check_nagios.c check_nt.c check_nwstat.c check_overcr.c 
	check_radius.c check_real.c check_snmp.c check_swap.c 
	check_tcp.c check_time.c negate.c netutils.c popen.c utils.c 
	utils.h 
Log Message:
replace "terminate" with "die" for shorter name and better readability

Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** check_by_ssh.c	2 Aug 2003 16:42:57 -0000	1.13
--- check_by_ssh.c	7 Aug 2003 11:51:11 -0000	1.14
***************
*** 350,356 ****
  	if (hostname == NULL) {
  		if (c <= argc) {
! 			terminate (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
  		} else if (!is_host (argv[c]))
! 			terminate (STATE_UNKNOWN, _("%s: Invalid host name %s\n"), progname, argv[c]);
  		hostname = argv[c++];
  	}
--- 350,356 ----
  	if (hostname == NULL) {
  		if (c <= argc) {
! 			die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
  		} else if (!is_host (argv[c]))
! 			die (STATE_UNKNOWN, _("%s: Invalid host name %s\n"), progname, argv[c]);
  		hostname = argv[c++];
  	}
***************
*** 386,393 ****
  
  	if (passive && commands != services)
! 		terminate (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
  
  	if (passive && host_shortname == NULL)
! 		terminate (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname);
  
  	return OK;
--- 386,393 ----
  
  	if (passive && commands != services)
! 		die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
  
  	if (passive && host_shortname == NULL)
! 		die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname);
  
  	return OK;

Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** check_disk.c	2 Aug 2003 16:42:57 -0000	1.29
--- check_disk.c	7 Aug 2003 11:51:11 -0000	1.30
***************
*** 288,292 ****
  	}
  
! 	terminate (result, "DISK %s%s\n", state_text (result), output, details);
  	return STATE_UNKNOWN;
  }
--- 288,292 ----
  	}
  
! 	die (result, "DISK %s%s\n", state_text (result), output, details);
  	return STATE_UNKNOWN;
  }
***************
*** 407,411 ****
  				units = "TB";
  			} else {
! 				terminate (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
  			}
  			break;
--- 407,411 ----
  				units = "TB";
  			} else {
! 				die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
  			}
  			break;

Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** check_dns.c	2 Aug 2003 16:42:57 -0000	1.18
--- check_dns.c	7 Aug 2003 11:51:11 -0000	1.19
***************
*** 181,185 ****
  				strip (address);
  				if (address==NULL || strlen(address)==0)
! 					terminate (STATE_CRITICAL,
  										 _("DNS CRITICAL - '%s' returned empty host name string\n"),
  										 NSLOOKUP_COMMAND);
--- 181,185 ----
  				strip (address);
  				if (address==NULL || strlen(address)==0)
! 					die (STATE_CRITICAL,
  										 _("DNS CRITICAL - '%s' returned empty host name string\n"),
  										 NSLOOKUP_COMMAND);
***************
*** 225,229 ****
  		 and we can segfault if we do not */
  	if (address==NULL || strlen(address)==0)
! 		terminate (STATE_CRITICAL,
  							 _("DNS CRITICAL - '%s' output parsing exited with no address\n"),
  							 NSLOOKUP_COMMAND);
--- 225,229 ----
  		 and we can segfault if we do not */
  	if (address==NULL || strlen(address)==0)
! 		die (STATE_CRITICAL,
  							 _("DNS CRITICAL - '%s' output parsing exited with no address\n"),
  							 NSLOOKUP_COMMAND);
***************
*** 271,279 ****
  	/* 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 */
--- 271,279 ----
  	/* DNS server is not running... */
  	else if (strstr (input_buffer, "No response from server"))
! 		die (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"))
! 		die (STATE_CRITICAL, _("Name server %s has no records\n"), dns_server);
  
  	/* Connection was refused */
***************
*** 282,286 ****
  	          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 */
--- 282,286 ----
  	          strstr (input_buffer, ": REFUSED")) ||
  	         (strstr (input_buffer, "Refused")))
! 		die (STATE_CRITICAL, _("Connection to name server %s was refused\n"), dns_server);
  
  	/* Host or domain name does not exist */
***************
*** 288,300 ****
  	         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 or the DNS lookup timed out */
--- 288,300 ----
  	         strstr (input_buffer, "** server can't find") ||
  	         strstr (input_buffer,"NXDOMAIN"))
! 		die (STATE_CRITICAL, _("Domain %s was not found by the server\n"), query_address);
  
  	/* Network is unreachable */
  	else if (strstr (input_buffer, "Network is unreachable"))
! 		die (STATE_CRITICAL, _("Network is unreachable\n"));
  
  	/* Internal server failure */
  	else if (strstr (input_buffer, "Server failure"))
! 		die (STATE_CRITICAL, _("Server failure for %s\n"), dns_server);
  
  	/* Request error or the DNS lookup timed out */
***************
*** 358,362 ****
  		case 'H': /* hostname */
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (query_address, optarg);
  			break;
--- 358,362 ----
  		case 'H': /* hostname */
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (query_address, optarg);
  			break;
***************
*** 370,374 ****
  			}
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (dns_server, optarg);
  			break;
--- 370,374 ----
  			}
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (dns_server, optarg);
  			break;
***************
*** 381,390 ****
  			}
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (ptr_server, optarg);
  			break;
  		case 'a': /* expected address */
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (expected_address, optarg);
  			match_expected_address = TRUE;
--- 381,390 ----
  			}
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (ptr_server, optarg);
  			break;
  		case 'a': /* expected address */
  			if (strlen (optarg) >= ADDRESS_LENGTH)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			strcpy (expected_address, optarg);
  			match_expected_address = TRUE;
***************
*** 396,400 ****
  	if (strlen(query_address)==0 && c<argc) {
  		if (strlen(argv[c])>=ADDRESS_LENGTH)
! 			terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  		strcpy (query_address, argv[c++]);
  	}
--- 396,400 ----
  	if (strlen(query_address)==0 && c<argc) {
  		if (strlen(argv[c])>=ADDRESS_LENGTH)
! 			die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  		strcpy (query_address, argv[c++]);
  	}
***************
*** 407,411 ****
  		}
  		if (strlen(argv[c]) >= ADDRESS_LENGTH)
! 			terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  		strcpy (dns_server, argv[c++]);
  	}
--- 407,411 ----
  		}
  		if (strlen(argv[c]) >= ADDRESS_LENGTH)
! 			die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  		strcpy (dns_server, argv[c++]);
  	}

Index: check_fping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_fping.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** check_fping.c	2 Aug 2003 22:06:06 -0000	1.7
--- check_fping.c	7 Aug 2003 11:51:11 -0000	1.8
***************
*** 174,187 ****
  
  	if (strstr (buf, "not found")) {
! 		terminate (STATE_CRITICAL, _("FPING unknown - %s not found\n"), server_name);
  
  	}
  	else if (strstr (buf, "is unreachable") || strstr (buf, "Unreachable")) {
! 		terminate (STATE_CRITICAL, _("FPING critical - %s is unreachable\n"),
  							 "host");
  
  	}
  	else if (strstr (buf, "is down")) {
! 		terminate (STATE_CRITICAL, _("FPING critical - %s is down\n"), server_name);
  
  	}
--- 174,187 ----
  
  	if (strstr (buf, "not found")) {
! 		die (STATE_CRITICAL, _("FPING unknown - %s not found\n"), server_name);
  
  	}
  	else if (strstr (buf, "is unreachable") || strstr (buf, "Unreachable")) {
! 		die (STATE_CRITICAL, _("FPING critical - %s is unreachable\n"),
  							 "host");
  
  	}
  	else if (strstr (buf, "is down")) {
! 		die (STATE_CRITICAL, _("FPING critical - %s is down\n"), server_name);
  
  	}
***************
*** 209,213 ****
  		else
  			status = STATE_OK;
! 		terminate (status, _("FPING %s - %s (loss=%f%%, rta=%f ms)\n"),
  							 state_text (status), server_name, loss, rta);
  
--- 209,213 ----
  		else
  			status = STATE_OK;
! 		die (status, _("FPING %s - %s (loss=%f%%, rta=%f ms)\n"),
  							 state_text (status), server_name, loss, rta);
  
***************
*** 228,232 ****
  			status = STATE_OK;
  		
! 		terminate (status, _("FPING %s - %s (loss=%f%% )\n"),
  							 state_text (status), server_name, loss );		
  	
--- 228,232 ----
  			status = STATE_OK;
  		
! 		die (status, _("FPING %s - %s (loss=%f%% )\n"),
  							 state_text (status), server_name, loss );		
  	
***************
*** 364,372 ****
  		arg1[strcspn (arg1, ",:")] = 0;
  		if (strstr (arg1, "%") && strstr (arg2, "%"))
! 			terminate (STATE_UNKNOWN,
  								 _("%s: Only one threshold may be packet loss (%s)\n"), progname,
  								 arg);
  		if (!strstr (arg1, "%") && !strstr (arg2, "%"))
! 			terminate (STATE_UNKNOWN,
  								 _("%s: Only one threshold must be packet loss (%s)\n"),
  								 progname, arg);
--- 364,372 ----
  		arg1[strcspn (arg1, ",:")] = 0;
  		if (strstr (arg1, "%") && strstr (arg2, "%"))
! 			die (STATE_UNKNOWN,
  								 _("%s: Only one threshold may be packet loss (%s)\n"), progname,
  								 arg);
  		if (!strstr (arg1, "%") && !strstr (arg2, "%"))
! 			die (STATE_UNKNOWN,
  								 _("%s: Only one threshold must be packet loss (%s)\n"),
  								 progname, arg);

Index: check_game.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_game.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** check_game.c	2 Aug 2003 22:06:06 -0000	1.5
--- check_game.c	7 Aug 2003 11:51:11 -0000	1.6
***************
*** 253,257 ****
  		case 'H': /* hostname */
  			if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			server_ip = strdup (optarg);
  			break;
--- 253,257 ----
  		case 'H': /* hostname */
  			if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			server_ip = strdup (optarg);
  			break;
***************
*** 261,265 ****
  		case 'G': /* hostname */
  			if (strlen (optarg) >= MAX_INPUT_BUFFER)
! 				terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			game_type = strdup (optarg);
  			break;
--- 261,265 ----
  		case 'G': /* hostname */
  			if (strlen (optarg) >= MAX_INPUT_BUFFER)
! 				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
  			game_type = strdup (optarg);
  			break;

Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** check_http.c	3 Aug 2003 06:05:14 -0000	1.39
--- check_http.c	7 Aug 2003 11:51:11 -0000	1.40
***************
*** 286,290 ****
  	if (use_ssl && check_cert == TRUE) {
  		if (connect_SSL () != OK)
! 			terminate (STATE_CRITICAL,
  			           _("HTTP CRITICAL - Could not make SSL connection\n"));
  		if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
--- 286,290 ----
  	if (use_ssl && check_cert == TRUE) {
  		if (connect_SSL () != OK)
! 			die (STATE_CRITICAL,
  			           _("HTTP CRITICAL - Could not make SSL connection\n"));
  		if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
***************
*** 597,601 ****
  
  		if (connect_SSL () != OK) {
! 			terminate (STATE_CRITICAL, _("Unable to open TCP socket"));
  		}
  
--- 597,601 ----
  
  		if (connect_SSL () != OK) {
! 			die (STATE_CRITICAL, _("Unable to open TCP socket"));
  		}
  
***************
*** 612,616 ****
  #endif
  		if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 			terminate (STATE_CRITICAL, _("Unable to open TCP socket"));
  #ifdef HAVE_SSL
  	}
--- 612,616 ----
  #endif
  		if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 			die (STATE_CRITICAL, _("Unable to open TCP socket"));
  #ifdef HAVE_SSL
  	}
***************
*** 670,681 ****
  			sslerr=SSL_get_error(ssl, i);
  			if ( sslerr == SSL_ERROR_SSL ) {
! 				terminate (STATE_WARNING, _("Client Certificate Required\n"));
  			} else {
! 				terminate (STATE_CRITICAL, _("Error in recv()"));
  			}
  		}
  		else {
  #endif
! 			terminate (STATE_CRITICAL, _("Error in recv()"));
  #ifdef HAVE_SSL
  		}
--- 670,681 ----
  			sslerr=SSL_get_error(ssl, i);
  			if ( sslerr == SSL_ERROR_SSL ) {
! 				die (STATE_WARNING, _("Client Certificate Required\n"));
  			} else {
! 				die (STATE_CRITICAL, _("Error in recv()"));
  			}
  		}
  		else {
  #endif
! 			die (STATE_CRITICAL, _("Error in recv()"));
  #ifdef HAVE_SSL
  		}
***************
*** 685,689 ****
  	/* return a CRITICAL status if we couldn't read any data */
  	if (pagesize == (size_t) 0)
! 		terminate (STATE_CRITICAL, _("No data received %s"), timestamp);
  
  	/* close the connection */
--- 685,689 ----
  	/* return a CRITICAL status if we couldn't read any data */
  	if (pagesize == (size_t) 0)
! 		die (STATE_CRITICAL, _("No data received %s"), timestamp);
  
  	/* close the connection */
***************
*** 709,713 ****
  		printf ("STATUS: %s\n", status_line);
  
! 	/* find header info and null terminate it */
  	header = page;
  	while (strcspn (page, "\r\n") > 0) {
--- 709,713 ----
  		printf ("STATUS: %s\n", status_line);
  
! 	/* find header info and null-terminate it */
  	header = page;
  	while (strcspn (page, "\r\n") > 0) {
***************
*** 733,737 ****
  			                _("Invalid HTTP response received from host on port %d\n"),
  			                server_port);
! 		terminate (STATE_CRITICAL, msg);
  	}
  
--- 733,737 ----
  			                _("Invalid HTTP response received from host on port %d\n"),
  			                server_port);
! 		die (STATE_CRITICAL, msg);
  	}
  
***************
*** 754,758 ****
  	    	strstr (status_line, "502") ||
  		    strstr (status_line, "503")) {
! 			terminate (STATE_CRITICAL, _("HTTP CRITICAL: %s\n"), status_line);
  		}
  
--- 754,758 ----
  	    	strstr (status_line, "502") ||
  		    strstr (status_line, "503")) {
! 			die (STATE_CRITICAL, _("HTTP CRITICAL: %s\n"), status_line);
  		}
  
***************
*** 763,767 ****
  		    strstr (status_line, "403") ||
  		    strstr (status_line, "404")) {
! 			terminate (STATE_WARNING, _("HTTP WARNING: %s\n"), status_line);
  		}
  
--- 763,767 ----
  		    strstr (status_line, "403") ||
  		    strstr (status_line, "404")) {
! 			die (STATE_WARNING, _("HTTP WARNING: %s\n"), status_line);
  		}
  
***************
*** 779,788 ****
  					server_address = realloc (server_address, MAX_IPV4_HOSTLENGTH + 1);
  					if (server_address == NULL)
! 						terminate (STATE_UNKNOWN,
  										 _("HTTP UNKNOWN: could not allocate server_address"));
  					if (strcspn (pos, "\r\n") > (size_t)server_url_length) {
  						server_url = realloc (server_url, strcspn (pos, "\r\n"));
  						if (server_url == NULL)
! 							terminate (STATE_UNKNOWN,
  							           _("HTTP UNKNOWN: could not allocate server_url"));
  						server_url_length = strcspn (pos, "\r\n");
--- 779,788 ----
  					server_address = realloc (server_address, MAX_IPV4_HOSTLENGTH + 1);
  					if (server_address == NULL)
! 						die (STATE_UNKNOWN,
  										 _("HTTP UNKNOWN: could not allocate server_address"));
  					if (strcspn (pos, "\r\n") > (size_t)server_url_length) {
  						server_url = realloc (server_url, strcspn (pos, "\r\n"));
  						if (server_url == NULL)
! 							die (STATE_UNKNOWN,
  							           _("HTTP UNKNOWN: could not allocate server_url"));
  						server_url_length = strcspn (pos, "\r\n");
***************
*** 841,845 ****
  		                 status_line, elapsed_time, timestamp,
  	                   (display_html ? "</A>" : ""), elapsed_time);
! 			terminate (onredirect, msg);
  		} /* end if (strstr (status_line, "30[0-4]") */
  
--- 841,845 ----
  		                 status_line, elapsed_time, timestamp,
  	                   (display_html ? "</A>" : ""), elapsed_time);
! 			die (onredirect, msg);
  		} /* end if (strstr (status_line, "30[0-4]") */
  
***************
*** 854,860 ****
  	               (display_html ? "</A>" : ""), elapsed_time);
  	if (check_critical_time == TRUE && elapsed_time > critical_time)
! 		terminate (STATE_CRITICAL, msg);
  	if (check_warning_time == TRUE && elapsed_time > warning_time)
! 		terminate (STATE_WARNING, msg);
  
  	/* Page and Header content checks go here */
--- 854,860 ----
  	               (display_html ? "</A>" : ""), elapsed_time);
  	if (check_critical_time == TRUE && elapsed_time > critical_time)
! 		die (STATE_CRITICAL, msg);
  	if (check_warning_time == TRUE && elapsed_time > warning_time)
! 		die (STATE_WARNING, msg);
  
  	/* Page and Header content checks go here */
***************
*** 909,913 ****
  	                status_line, (float)elapsed_time,
  	                timestamp, (display_html ? "</A>" : ""), elapsed_time);
! 	terminate (STATE_OK, msg);
  	return STATE_UNKNOWN;
  }
--- 909,913 ----
  	                status_line, (float)elapsed_time,
  	                timestamp, (display_html ? "</A>" : ""), elapsed_time);
! 	die (STATE_OK, msg);
  	return STATE_UNKNOWN;
  }

Index: check_mrtg.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** check_mrtg.c	3 Aug 2003 14:24:33 -0000	1.6
--- check_mrtg.c	7 Aug 2003 11:51:11 -0000	1.7
***************
*** 305,309 ****
  			expire_minutes = atoi (argv[c++]);
  		else
! 			terminate (STATE_UNKNOWN,
  			           _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
  			           argv[c], progname);
--- 305,309 ----
  			expire_minutes = atoi (argv[c++]);
  		else
! 			die (STATE_UNKNOWN,
  			           _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
  			           argv[c], progname);

Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** check_mrtgtraf.c	3 Aug 2003 14:24:33 -0000	1.6
--- check_mrtgtraf.c	7 Aug 2003 11:51:11 -0000	1.7
***************
*** 164,168 ****
  	if (expire_minutes > 0
  			&& (current_time - timestamp) >
! 			(expire_minutes * 60)) terminate (STATE_WARNING,
  																				_("MRTG data has expired (%d minutes old)\n"),
  																				(int) ((current_time - timestamp) /
--- 164,168 ----
  	if (expire_minutes > 0
  			&& (current_time - timestamp) >
! 			(expire_minutes * 60)) die (STATE_WARNING,
  																				_("MRTG data has expired (%d minutes old)\n"),
  																				(int) ((current_time - timestamp) /

Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** check_nagios.c	4 Aug 2003 07:42:24 -0000	1.8
--- check_nagios.c	7 Aug 2003 11:51:11 -0000	1.9
***************
*** 218,222 ****
  			expire_minutes = atoi (argv[2]);
  		else
! 			terminate (STATE_UNKNOWN,
  								 _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
  								 progname);
--- 218,222 ----
  			expire_minutes = atoi (argv[2]);
  		else
! 			die (STATE_UNKNOWN,
  								 _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
  								 progname);
***************
*** 252,256 ****
  				expire_minutes = atoi (optarg);
  			else
! 				terminate (STATE_UNKNOWN,
  									 _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
  									 progname);
--- 252,256 ----
  				expire_minutes = atoi (optarg);
  			else
! 				die (STATE_UNKNOWN,
  									 _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
  									 progname);
***************
*** 264,272 ****
  
  	if (status_log == NULL)
! 		terminate (STATE_UNKNOWN,
  							 _("You must provide the status_log\nType '%s -h' for additional help\n"),
  							 progname);
  	else if (process_string == NULL)
! 		terminate (STATE_UNKNOWN,
  							 _("You must provide a process string\nType '%s -h' for additional help\n"),
  							 progname);
--- 264,272 ----
  
  	if (status_log == NULL)
! 		die (STATE_UNKNOWN,
  							 _("You must provide the status_log\nType '%s -h' for additional help\n"),
  							 progname);
  	else if (process_string == NULL)
! 		die (STATE_UNKNOWN,
  							 _("You must provide a process string\nType '%s -h' for additional help\n"),
  							 progname);

Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** check_nt.c	9 Apr 2003 03:46:26 -0000	1.12
--- check_nt.c	7 Aug 2003 11:51:11 -0000	1.13
***************
*** 449,453 ****
  					server_port=atoi(optarg);
  				else
! 					terminate(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",progname);
  				break;
  			case 'v':
--- 449,453 ----
  					server_port=atoi(optarg);
  				else
! 					die(STATE_UNKNOWN,"Server port an integer (seconds)\nType '%s -h' for additional help\n",progname);
  				break;
  			case 'v':

Index: check_nwstat.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nwstat.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** check_nwstat.c	6 Aug 2003 12:11:21 -0000	1.9
--- check_nwstat.c	7 Aug 2003 11:51:11 -0000	1.10
***************
*** 764,768 ****
  					server_port=atoi(optarg);
  				else
! 					terminate(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
  				break;
  			case 'v':
--- 764,768 ----
  					server_port=atoi(optarg);
  				else
! 					die(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
  				break;
  			case 'v':

Index: check_overcr.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_overcr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** check_overcr.c	6 Aug 2003 12:13:03 -0000	1.4
--- check_overcr.c	7 Aug 2003 11:51:11 -0000	1.5
***************
*** 102,120 ****
  	
  		if (result != STATE_OK)
! 			terminate (result, _("Unknown error fetching load data\n"));
  
  		temp_ptr = (char *) strtok (recv_buffer, "\r\n");
  		if (temp_ptr == NULL)
! 			terminate (STATE_CRITICAL, _("Invalid response from server - no load information\n"));
  		load_1min = strtod (temp_ptr, NULL);
  
  		temp_ptr = (char *) strtok (NULL, "\r\n");
  		if (temp_ptr == NULL)
! 			terminate (STATE_CRITICAL, _("Invalid response from server after load 1\n"));
  		load_5min = strtod (temp_ptr, NULL);
  
  		temp_ptr = (char *) strtok (NULL, "\r\n");
  		if (temp_ptr == NULL)
! 			terminate (STATE_CRITICAL, _("Invalid response from server after load 5\n"));
  		load_15min = strtod (temp_ptr, NULL);
  
--- 102,120 ----
  	
  		if (result != STATE_OK)
! 			die (result, _("Unknown error fetching load data\n"));
  
  		temp_ptr = (char *) strtok (recv_buffer, "\r\n");
  		if (temp_ptr == NULL)
! 			die (STATE_CRITICAL, _("Invalid response from server - no load information\n"));
  		load_1min = strtod (temp_ptr, NULL);
  
  		temp_ptr = (char *) strtok (NULL, "\r\n");
  		if (temp_ptr == NULL)
! 			die (STATE_CRITICAL, _("Invalid response from server after load 1\n"));
  		load_5min = strtod (temp_ptr, NULL);
  
  		temp_ptr = (char *) strtok (NULL, "\r\n");
  		if (temp_ptr == NULL)
! 			die (STATE_CRITICAL, _("Invalid response from server after load 5\n"));
  		load_15min = strtod (temp_ptr, NULL);
  
***************
*** 139,143 ****
  			result = STATE_WARNING;
  
! 		terminate (result,
  		          _("Load %s - %s-min load average = %0.2f"),
  							 state_text(result),
--- 139,143 ----
  			result = STATE_WARNING;
  
! 		die (result,
  		          _("Load %s - %s-min load average = %0.2f"),
  							 state_text(result),
***************
*** 150,154 ****
  
  		if (result != STATE_OK)
! 			terminate (result, _("Unknown error fetching disk data\n"));
  
  		for (temp_ptr = (char *) strtok (recv_buffer, " ");
--- 150,154 ----
  
  		if (result != STATE_OK)
! 			die (result, _("Unknown error fetching disk data\n"));
  
  		for (temp_ptr = (char *) strtok (recv_buffer, " ");
***************
*** 160,164 ****
  				temp_ptr = (char *) strtok (NULL, "%");
  				if (temp_ptr == NULL)
! 					terminate (STATE_CRITICAL, _("Invalid response from server\n"));
  				percent_used_disk_space = strtoul (temp_ptr, NULL, 10);
  				break;
--- 160,164 ----
  				temp_ptr = (char *) strtok (NULL, "%");
  				if (temp_ptr == NULL)
! 					die (STATE_CRITICAL, _("Invalid response from server\n"));
  				percent_used_disk_space = strtoul (temp_ptr, NULL, 10);
  				break;
***************
*** 170,174 ****
  		/* error if we couldn't find the info for the disk */
  		if (found_disk == FALSE)
! 			terminate (STATE_CRITICAL,
  			           "Error: Disk '%s' non-existent or not mounted",
  			           disk_name);
--- 170,174 ----
  		/* error if we couldn't find the info for the disk */
  		if (found_disk == FALSE)
! 			die (STATE_CRITICAL,
  			           "Error: Disk '%s' non-existent or not mounted",
  			           disk_name);
***************
*** 179,183 ****
  			result = STATE_WARNING;
  
! 		terminate (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
  
  		break;
--- 179,183 ----
  			result = STATE_WARNING;
  
! 		die (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
  
  		break;
***************
*** 186,190 ****
  
  		if (result != STATE_OK)
! 			terminate (result, _("Unknown error fetching network status\n"));
  
  		port_connections = strtod (recv_buffer, NULL);
--- 186,190 ----
  
  		if (result != STATE_OK)
! 			die (result, _("Unknown error fetching network status\n"));
  
  		port_connections = strtod (recv_buffer, NULL);
***************
*** 195,199 ****
  			result = STATE_WARNING;
  
! 		terminate (result,
  		           _("Net %s - %d connection%s on port %d"),
  		           state_text(result),
--- 195,199 ----
  			result = STATE_WARNING;
  
! 		die (result,
  		           _("Net %s - %d connection%s on port %d"),
  		           state_text(result),
***************
*** 207,219 ****
  
  		if (result != STATE_OK)
! 			terminate (result, _("Unknown error fetching process status\n"));
  
  		temp_ptr = (char *) strtok (recv_buffer, "(");
  		if (temp_ptr == NULL)
! 			terminate (STATE_CRITICAL, _("Invalid response from server\n"));
  
  		temp_ptr = (char *) strtok (NULL, ")");
  		if (temp_ptr == NULL)
! 			terminate (STATE_CRITICAL, _("Invalid response from server\n"));
  
  		processes = strtod (temp_ptr, NULL);
--- 207,219 ----
  
  		if (result != STATE_OK)
! 			die (result, _("Unknown error fetching process status\n"));
  
  		temp_ptr = (char *) strtok (recv_buffer, "(");
  		if (temp_ptr == NULL)
! 			die (STATE_CRITICAL, _("Invalid response from server\n"));
  
  		temp_ptr = (char *) strtok (NULL, ")");
  		if (temp_ptr == NULL)
! 			die (STATE_CRITICAL, _("Invalid response from server\n"));
  
  		processes = strtod (temp_ptr, NULL);
***************
*** 224,228 ****
  			result = STATE_WARNING;
  
! 		terminate (result,
  		           _("Process %s - %d instance%s of %s running"),
  		           state_text(result),
--- 224,228 ----
  			result = STATE_WARNING;
  
! 		die (result,
  		           _("Process %s - %d instance%s of %s running"),
  		           state_text(result),
***************
*** 251,255 ****
  		uptime_minutes = uptime_raw_minutes;
  
! 		terminate (result,
  		           _("Uptime %s - Up %d days %d hours %d minutes"),
  		           state_text(result),
--- 251,255 ----
  		uptime_minutes = uptime_raw_minutes;
  
! 		die (result,
  		           _("Uptime %s - Up %d days %d hours %d minutes"),
  		           state_text(result),
***************
*** 260,264 ****
  
  	default:
! 		terminate (STATE_UNKNOWN, _("Nothing to check!\n"));
  		break;
  	}
--- 260,264 ----
  
  	default:
! 		die (STATE_UNKNOWN, _("Nothing to check!\n"));
  		break;
  	}
***************
*** 341,345 ****
  				server_port = atoi (optarg);
  			else
! 				terminate (STATE_UNKNOWN,
  									 _("Server port an integer (seconds)\nType '%s -h' for additional help\n"),
  									 progname);
--- 341,345 ----
  				server_port = atoi (optarg);
  			else
! 				die (STATE_UNKNOWN,
  									 _("Server port an integer (seconds)\nType '%s -h' for additional help\n"),
  									 progname);

Index: check_radius.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_radius.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** check_radius.c	4 Aug 2003 07:42:24 -0000	1.6
--- check_radius.c	7 Aug 2003 11:51:12 -0000	1.7
***************
*** 166,170 ****
  	if ((config_file && rc_read_config (config_file)) ||
  			rc_read_dictionary (rc_conf_str ("dictionary")))
! 		terminate (STATE_UNKNOWN, _("Config file error"));
  
  	service = PW_AUTHENTICATE_ONLY;
--- 166,170 ----
  	if ((config_file && rc_read_config (config_file)) ||
  			rc_read_dictionary (rc_conf_str ("dictionary")))
! 		die (STATE_UNKNOWN, _("Config file error"));
  
  	service = PW_AUTHENTICATE_ONLY;
***************
*** 173,177 ****
  				rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
  				rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)))
! 		terminate (STATE_UNKNOWN, _("Out of Memory?"));
  
  	/* 
--- 173,177 ----
  				rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
  				rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)))
! 		die (STATE_UNKNOWN, _("Out of Memory?"));
  
  	/* 
***************
*** 194,206 ****
  
  	if (result == TIMEOUT_RC)
! 		terminate (STATE_CRITICAL, _("Timeout"));
  	if (result == ERROR_RC)
! 		terminate (STATE_CRITICAL, _("Auth Error"));
  	if (result == BADRESP_RC)
! 		terminate (STATE_WARNING, _("Auth Failed"));
  	if (expect && !strstr (msg, expect))
! 		terminate (STATE_WARNING, msg);
  	if (result == OK_RC)
! 		terminate (STATE_OK, _("Auth OK"));
  	return (0);
  }
--- 194,206 ----
  
  	if (result == TIMEOUT_RC)
! 		die (STATE_CRITICAL, _("Timeout"));
  	if (result == ERROR_RC)
! 		die (STATE_CRITICAL, _("Auth Error"));
  	if (result == BADRESP_RC)
! 		die (STATE_WARNING, _("Auth Failed"));
  	if (expect && !strstr (msg, expect))
! 		die (STATE_WARNING, msg);
  	if (result == OK_RC)
! 		die (STATE_OK, _("Auth OK"));
  	return (0);
  }

Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** check_real.c	7 Jun 2003 00:36:26 -0000	1.7
--- check_real.c	7 Aug 2003 11:51:12 -0000	1.8
***************
*** 92,96 ****
  	/* try to connect to the host at the given port number */
  	if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 		terminate (STATE_CRITICAL, "Unable to connect to %s on port %d\n",
  							 server_address, server_port);
  
--- 92,96 ----
  	/* try to connect to the host at the given port number */
  	if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
! 		die (STATE_CRITICAL, "Unable to connect to %s on port %d\n",
  							 server_address, server_port);
  
***************
*** 114,118 ****
  	/* return a CRITICAL status if we couldn't read any data */
  	if (result == -1)
! 		terminate (STATE_CRITICAL, "No data received from %s\n", host_name);
  
  	/* make sure we find the response we are looking for */
--- 114,118 ----
  	/* return a CRITICAL status if we couldn't read any data */
  	if (result == -1)
! 		die (STATE_CRITICAL, "No data received from %s\n", host_name);
  
  	/* make sure we find the response we are looking for */

Index: check_snmp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_snmp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** check_snmp.c	2 Aug 2003 22:06:06 -0000	1.30
--- check_snmp.c	7 Aug 2003 11:51:12 -0000	1.31
***************
*** 362,366 ****
  			p2 = strpbrk (p2, "0123456789");
  			if (p2 == NULL) 
! 				terminate (STATE_UNKNOWN,"No valid data returned");
  			response_value[i] = strtoul (p2, NULL, 10);
  			iresult = check_num (i);
--- 362,366 ----
  			p2 = strpbrk (p2, "0123456789");
  			if (p2 == NULL) 
! 				die (STATE_UNKNOWN,"No valid data returned");
  			response_value[i] = strtoul (p2, NULL, 10);
  			iresult = check_num (i);
***************
*** 428,432 ****
  
  	if (found == 0)
! 		terminate
  			(STATE_UNKNOWN,
  			 _("%s problem - No data recieved from host\nCMD: %s\n"),
--- 428,432 ----
  
  	if (found == 0)
! 		die
  			(STATE_UNKNOWN,
  			 _("%s problem - No data recieved from host\nCMD: %s\n"),
***************
*** 644,648 ****
  				labels = realloc (labels, labels_size);
  				if (labels == NULL)
! 					terminate (STATE_UNKNOWN,
  										 _("Could not realloc() labels[%d]"), nlabels);
  			}
--- 644,648 ----
  				labels = realloc (labels, labels_size);
  				if (labels == NULL)
! 					die (STATE_UNKNOWN,
  										 _("Could not realloc() labels[%d]"), nlabels);
  			}
***************
*** 658,662 ****
  					labels = realloc (labels, labels_size);
  					if (labels == NULL)
! 						terminate (STATE_UNKNOWN, _("Could not realloc() labels\n"));
  				}
  				labels++;
--- 658,662 ----
  					labels = realloc (labels, labels_size);
  					if (labels == NULL)
! 						die (STATE_UNKNOWN, _("Could not realloc() labels\n"));
  				}
  				labels++;
***************
*** 675,679 ****
  				unitv = realloc (unitv, unitv_size);
  				if (unitv == NULL)
! 					terminate (STATE_UNKNOWN,
  										 _("Could not realloc() units [%d]\n"), nunits);
  			}
--- 675,679 ----
  				unitv = realloc (unitv, unitv_size);
  				if (unitv == NULL)
! 					die (STATE_UNKNOWN,
  										 _("Could not realloc() units [%d]\n"), nunits);
  			}
***************
*** 689,693 ****
  					unitv = realloc (unitv, unitv_size);
  					if (units == NULL)
! 						terminate (STATE_UNKNOWN, _("Could not realloc() units\n"));
  				}
  				nunits++;
--- 689,693 ----
  					unitv = realloc (unitv, unitv_size);
  					if (units == NULL)
! 						die (STATE_UNKNOWN, _("Could not realloc() units\n"));
  				}
  				nunits++;
***************
*** 906,910 ****
  	if (strstr (str, "'") == str) {	/* handle SIMPLE quoted strings */
  		if (strlen (str) == 1 || !strstr (str + 1, "'"))
! 			terminate (STATE_UNKNOWN, "Unbalanced quotes\n");
  	}
  	return str;
--- 906,910 ----
  	if (strstr (str, "'") == str) {	/* handle SIMPLE quoted strings */
  		if (strlen (str) == 1 || !strstr (str + 1, "'"))
! 			die (STATE_UNKNOWN, "Unbalanced quotes\n");
  	}
  	return str;

Index: check_swap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_swap.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** check_swap.c	2 Aug 2003 16:42:57 -0000	1.15
--- check_swap.c	7 Aug 2003 11:51:12 -0000	1.16
***************
*** 226,230 ****
  #endif
  
! 	terminate (result, "SWAP %s:%s\n", state_text (result), status);
  	return STATE_UNKNOWN;
  }
--- 226,230 ----
  #endif
  
! 	die (result, "SWAP %s:%s\n", state_text (result), status);
  	return STATE_UNKNOWN;
  }

Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** check_tcp.c	3 Aug 2003 06:05:14 -0000	1.32
--- check_tcp.c	7 Aug 2003 11:51:12 -0000	1.33
***************
*** 324,328 ****
  		/* return a CRITICAL status if we couldn't read any data */
  		if (status == NULL)
! 			terminate (STATE_CRITICAL, _("No data received from host\n"));
  
  		strip (status);
--- 324,328 ----
  		/* return a CRITICAL status if we couldn't read any data */
  		if (status == NULL)
! 			die (STATE_CRITICAL, _("No data received from host\n"));
  
  		strip (status);
***************
*** 336,340 ****
  					printf ("%d %d\n", i, server_expect_count);
  				if (i >= server_expect_count)
! 					terminate (STATE_WARNING, _("Invalid response from host\n"));
  				if (strstr (status, server_expect[i]))
  					break;
--- 336,340 ----
  					printf ("%d %d\n", i, server_expect_count);
  				if (i >= server_expect_count)
! 					die (STATE_WARNING, _("Invalid response from host\n"));
  				if (strstr (status, server_expect[i]))
  					break;
***************
*** 543,547 ****
  		case 'S':
  #ifndef HAVE_SSL
! 			terminate (STATE_UNKNOWN,
  				_("SSL support not available. Install OpenSSL and recompile."));
  #endif
--- 543,547 ----
  		case 'S':
  #ifndef HAVE_SSL
! 			die (STATE_UNKNOWN,
  				_("SSL support not available. Install OpenSSL and recompile."));
  #endif

Index: check_time.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_time.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** check_time.c	4 Aug 2003 08:13:20 -0000	1.6
--- check_time.c	7 Aug 2003 11:51:12 -0000	1.7
***************
*** 120,124 ****
  		else
  			result = STATE_UNKNOWN;
! 		terminate (result,
  		           _("TIME UNKNOWN - could not connect to server %s, port %d\n"),
  		           server_address, server_port);
--- 120,124 ----
  		else
  			result = STATE_UNKNOWN;
! 		die (result,
  		           _("TIME UNKNOWN - could not connect to server %s, port %d\n"),
  		           server_address, server_port);
***************
*** 143,147 ****
  		else
  			result = STATE_UNKNOWN;
! 		terminate (result,
  							 _("TIME UNKNOWN - no data on recv() from server %s, port %d\n"),
  							 server_address, server_port);
--- 143,147 ----
  		else
  			result = STATE_UNKNOWN;
! 		die (result,
  							 _("TIME UNKNOWN - no data on recv() from server %s, port %d\n"),
  							 server_address, server_port);
***************
*** 156,160 ****
  
  	if (result != STATE_OK)
! 		terminate (result, _("TIME %s - %d second response time\n"),
  							 state_text (result), (int) (end_time - start_time));
  
--- 156,160 ----
  
  	if (result != STATE_OK)
! 		die (result, _("TIME %s - %d second response time\n"),
  							 state_text (result), (int) (end_time - start_time));
  

Index: negate.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/negate.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** negate.c	4 Aug 2003 07:42:24 -0000	1.10
--- negate.c	7 Aug 2003 11:51:12 -0000	1.11
***************
*** 139,143 ****
  	/* Set signal handling and alarm */
  	if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR)
! 		terminate (STATE_UNKNOWN, _("Cannot catch SIGALRM"));
  
  	(void) alarm ((unsigned) timeout_interval);
--- 139,143 ----
  	/* Set signal handling and alarm */
  	if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR)
! 		die (STATE_UNKNOWN, _("Cannot catch SIGALRM"));
  
  	(void) alarm ((unsigned) timeout_interval);
***************
*** 145,149 ****
  	child_process = spopen (command_line);
  	if (child_process == NULL)
! 		terminate (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line);
  
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
--- 145,149 ----
  	child_process = spopen (command_line);
  	if (child_process == NULL)
! 		die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line);
  
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
***************
*** 164,168 ****
  
  	if (!found)
! 		terminate (STATE_UNKNOWN,\
  		           _("%s problem - No data recieved from host\nCMD: %s\n"),\
  		           argv[0],	command_line);
--- 164,168 ----
  
  	if (!found)
! 		die (STATE_UNKNOWN,\
  		           _("%s problem - No data recieved from host\nCMD: %s\n"),\
  		           argv[0],	command_line);

Index: netutils.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** netutils.c	30 Jun 2003 18:52:38 -0000	1.11
--- netutils.c	7 Aug 2003 11:51:12 -0000	1.12
***************
*** 212,216 ****
  			recv_buffer[recv_result] = 0;
  
! 		/* terminate returned string */
  		recv_buffer[recv_size - 1] = 0;
  	}
--- 212,216 ----
  			recv_buffer[recv_result] = 0;
  
! 		/* die returned string */
  		recv_buffer[recv_size - 1] = 0;
  	}

Index: popen.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/popen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** popen.c	1 Aug 2003 06:01:50 -0000	1.4
--- popen.c	7 Aug 2003 11:51:12 -0000	1.5
***************
*** 265,269 ****
  
  /* Fatal error related to a system call.
!  * Print a message and terminate. */
  
  void
--- 265,269 ----
  
  /* Fatal error related to a system call.
!  * Print a message and die. */
  
  void

Index: utils.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** utils.c	2 Aug 2003 18:22:51 -0000	1.26
--- utils.c	7 Aug 2003 11:51:12 -0000	1.27
***************
*** 133,147 ****
  {
  	va_list ap;
- 	printf ("%s %s: ", sizeof (char) + index(progname, '_'), state_text(result));
- 	va_start (ap, fmt);
- 	vprintf (fmt, ap);
- 	va_end (ap);
- 	exit (result);
- }
- 
- void
- terminate (int result, const char *fmt, ...)
- {
- 	va_list ap;
  	va_start (ap, fmt);
  	vprintf (fmt, ap);
--- 133,136 ----
***************
*** 483,487 ****
  		dest = realloc (dest, len + 1);
  	if (dest == NULL)
! 		terminate (STATE_UNKNOWN, "failed realloc in strpcpy\n");
  
  	strncpy (dest, src, len);
--- 472,476 ----
  		dest = realloc (dest, len + 1);
  	if (dest == NULL)
! 		die (STATE_UNKNOWN, "failed realloc in strpcpy\n");
  
  	strncpy (dest, src, len);
***************
*** 527,531 ****
  	dest = realloc (dest, len + l2 + 1);
  	if (dest == NULL)
! 		terminate (STATE_UNKNOWN, "failed malloc in strscat\n");
  
  	strncpy (dest + len, src, l2);
--- 516,520 ----
  	dest = realloc (dest, len + l2 + 1);
  	if (dest == NULL)
! 		die (STATE_UNKNOWN, "failed malloc in strscat\n");
  
  	strncpy (dest + len, src, l2);

Index: utils.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** utils.h	2 Aug 2003 22:06:06 -0000	1.9
--- utils.h	7 Aug 2003 11:51:12 -0000	1.10
***************
*** 18,22 ****
  void print_revision (const char *, const char *);
  void die (int result, const char *fmt, ...);
- void terminate (int result, const char *msg, ...);
  
  /* Handle timeouts */
--- 18,21 ----





More information about the Commits mailing list