[Nagiosplug-checkins] nagiosplug/plugins check_http.c,1.88,1.89

[Ton Voon]

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

Modified Files:
	check_http.c 
Log Message:
Allow multiple -k parameters (Gerd Mueller - 1457726)


Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- check_http.c	24 Mar 2006 16:25:46 -0000	1.88
+++ check_http.c	5 Apr 2006 07:58:27 -0000	1.89
@@ -89,7 +89,8 @@
 int check_critical_time = FALSE;
 char user_auth[MAX_INPUT_BUFFER] = "";
 int display_html = FALSE;
-char *http_opt_headers;
+char **http_opt_headers;
+int http_opt_headers_count = 0;
 int onredirect = STATE_OK;
 int use_ssl = FALSE;
 int verbose = FALSE;
@@ -245,7 +246,12 @@
       asprintf (&user_agent, "User-Agent: %s", optarg);
       break;
     case 'k': /* Additional headers */
-      asprintf (&http_opt_headers, "%s", optarg);
+      if (http_opt_headers_count == 0)
+        http_opt_headers = malloc (sizeof (char *) * (++http_opt_headers_count));
+      else
+        http_opt_headers = realloc (http_opt_headers, sizeof (char *) * (++http_opt_headers_count));
+      http_opt_headers[http_opt_headers_count - 1] = optarg;
+      //asprintf (&http_opt_headers, "%s", optarg);
       break;
     case 'L': /* show html link */
       display_html = TRUE;
@@ -767,9 +773,12 @@
     asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
 
   /* optionally send any other header tag */
-  if (http_opt_headers) {
-    for ((pos = strtok(http_opt_headers, INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER)))
-      asprintf (&buf, "%s%s\r\n", buf, pos);
+  if (http_opt_headers_count) {
+    for (i = 0; i < http_opt_headers_count ; i++) {
+      for ((pos = strtok(http_opt_headers[i], INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER)))
+        asprintf (&buf, "%s%s\r\n", buf, pos);
+    }
+    free(http_opt_headers);
   }
 
   /* optionally send the authentication info */
@@ -1277,7 +1286,7 @@
  -A, --useragent=STRING\n\
    String to be sent in http header as \"User Agent\"\n\
  -k, --header=STRING\n\
-   Any other tags to be sent in http header, separated by semicolon\n\
+   Any other tags to be sent in http header. Use multiple times for additional headers\n\
  -L, --link=URL\n\
    Wrap output in HTML link (obsoleted by urlize)\n\
  -f, --onredirect=<ok|warning|critical|follow>\n\