[Nagiosplug-checkins] CVS: nagiosplug/plugins check_dig.c,1.25,1.26

[Ton Voon]

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

Modified Files:
	check_dig.c 
Log Message:
Checks different record types and checks against an expected address (Bill Kunkel)


Index: check_dig.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** check_dig.c	4 Mar 2004 05:08:43 -0000	1.25
--- check_dig.c	18 Aug 2004 21:25:50 -0000	1.26
***************
*** 38,41 ****
--- 38,43 ----
  
  char *query_address = NULL;
+ char *record_type = "A";
+ char *expected_address = NULL;
  char *dns_server = NULL;
  int verbose = FALSE;
***************
*** 69,80 ****
  
  	/* get the command to run */
! 	asprintf (&command_line, "%s @%s -p %d %s",
! 	          PATH_TO_DIG, dns_server, server_port, query_address);
  
  	alarm (timeout_interval);
  	gettimeofday (&tv, NULL);
  
! 	if (verbose)
  		printf ("%s\n", command_line);
  
  	/* run the command */
--- 71,88 ----
  
  	/* get the command to run */
! 	asprintf (&command_line, "%s @%s -p %d %s -t %s",
! 	          PATH_TO_DIG, dns_server, server_port, query_address, record_type);
  
  	alarm (timeout_interval);
  	gettimeofday (&tv, NULL);
  
! 	if (verbose) {
  		printf ("%s\n", command_line);
+ 		if(expected_address != NULL) {
+ 			printf ("Looking for: '%s'\n", expected_address);
+ 		} else {
+ 			printf ("Looking for: '%s'\n", query_address);
+ 		}
+ 	}
  
  	/* run the command */
***************
*** 94,119 ****
  		if (strstr (input_buffer, ";; ANSWER SECTION:")) {
  
! 			/* get the host address */
! 			if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
! 				break;
! 
! 			if (strpbrk (input_buffer, "\r\n"))
! 				input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
! 
! 			if (strstr (input_buffer, query_address) == input_buffer) {
! 				output = strdup(input_buffer);
! 				result = STATE_OK;
! 			}
! 			else {
! 				asprintf (&output, _("Server not found in ANSWER SECTION"));
! 				result = STATE_WARNING;
! 			}
  
- 			continue;
  		}
  
  	}
  
! 	if (result != STATE_OK) {
  		asprintf (&output, _("No ANSWER SECTION found"));
  	}
--- 102,138 ----
  		if (strstr (input_buffer, ";; ANSWER SECTION:")) {
  
! 			/* loop through the whole 'ANSWER SECTION' */
! 			do {
! 				/* get the host address */
! 				if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
! 					break;
! 
! 				if (strpbrk (input_buffer, "\r\n"))
! 					input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
! 
! 				if (verbose && !strstr (input_buffer, ";; ")) 
! 					printf ("%s\n", input_buffer); 
! 
! 				if (expected_address==NULL && strstr (input_buffer, query_address) != NULL) {
! 					output = strdup(input_buffer);
! 					result = STATE_OK;
! 				}
! 				else if (expected_address != NULL && strstr (input_buffer, expected_address) != NULL) {
! 					output = strdup(input_buffer);
!                         	        result = STATE_OK;
! 				}
! 
! 			} while (!strstr (input_buffer, ";; "));
! 
! 			if (result == STATE_UNKNOWN) {
! 		        	asprintf (&output, _("Server not found in ANSWER SECTION"));
! 	                        result = STATE_WARNING;
!                         }
  
  		}
  
  	}
  
! 	if (result == STATE_UNKNOWN) {
  		asprintf (&output, _("No ANSWER SECTION found"));
  	}
***************
*** 182,185 ****
--- 201,206 ----
  		{"version", no_argument, 0, 'V'},
  		{"help", no_argument, 0, 'h'},
+ 		{"record_type", required_argument, 0, 'T'},
+ 		{"expected_address", required_argument, 0, 'a'},
  		{0, 0, 0, 0}
  	};
***************
*** 189,193 ****
  
  	while (1) {
! 		c = getopt_long (argc, argv, "hVvt:l:H:w:c:", longopts, &option);
  
  		if (c == -1 || c == EOF)
--- 210,214 ----
  
  	while (1) {
! 		c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:a:", longopts, &option);
  
  		if (c == -1 || c == EOF)
***************
*** 249,252 ****
--- 270,279 ----
  			verbose = TRUE;
  			break;
+ 		case 'T':
+ 			record_type = optarg;
+ 			break;
+ 		case 'a':
+ 			expected_address = optarg;
+ 			break;
  		}
  	}
***************
*** 310,313 ****
--- 337,349 ----
     machine name to lookup\n"));
  
+         printf (_("\
+  -T, --record_type=STRING\n\
+    record type to lookup (default: A)\n"));
+ 
+         printf (_("\
+  -a, --expected_address=STRING\n\
+    an address expected to be in the asnwer section.\n\
+    if not set, uses whatever was in -l\n"));
+ 
  	printf (_(UT_WARN_CRIT));
  
***************
*** 326,331 ****
  {
  	printf (_("\
! Usage: %s -H host -l lookup [-p <server port>] [-w <warning interval>]\n\
!          [-c <critical interval>] [-t <timeout>] [-v]\n"),
  	        progname);
  	printf ("       %s (-h|--help)\n", progname);
--- 362,368 ----
  {
  	printf (_("\
! Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
!          [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
!          [-a <expected answer address>] [-v]\n"),
  	        progname);
  	printf ("       %s (-h|--help)\n", progname);