9 files changed, 48 insertions, 26 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9297a757..c4975f1d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,10 +49,10 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          - 'debian:testing'
+          - 'debian:stable'
           #...
         include:
-          - distro: 'debian:testing'
+          - distro: 'debian:stable'
             prepare: .github/prepare_debian.sh
           #...
     steps:
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 0cc864ae..09c0dc4f 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -36,6 +36,7 @@
  */
 typedef struct {
         char *file;
+        bool file_string_on_heap;
         char *stanza;
 } np_ini_info;
 
@@ -95,16 +96,22 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
                 i->stanza = malloc(sizeof(char) * (stanza_len + 1));
                 strncpy(i->stanza, locator, stanza_len);
                 i->stanza[stanza_len] = '\0';
-        } else  /* otherwise we use the default stanza */
+        } else  {/* otherwise we use the default stanza */
                 i->stanza = strdup(def_stanza);
+        }
 
         if (i->stanza == NULL)
                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
 
         /* check whether there's an @file part */
-        i->file = stanza_len == locator_len
-            ? default_file()
-            : strdup(&(locator[stanza_len + 1]));
+        if (stanza_len == locator_len) {
+            i->file = default_file();
+                i->file_string_on_heap = false;
+        } else {
+                i->file = strdup(&(locator[stanza_len + 1]));
+                i->file_string_on_heap = true;
+        }
+
         if (i->file == NULL || i->file[0] == '\0')
                 die(STATE_UNKNOWN,
                     _("Cannot find config file in any standard location.\n"));
@@ -136,7 +143,10 @@ np_get_defaults(const char *locator, const char *default_section)
                     _("Invalid section '%s' in config file '%s'\n"), i.stanza,
                     i.file);
 
-        free(i.file);
+        if (i.file_string_on_heap) {
+                free(i.file);
+        }
+
         if (inifile != stdin)
                 fclose(inifile);
         free(i.stanza);
@@ -358,14 +368,18 @@ add_option(FILE *f, np_arg_list **optlst)
 static char *
 default_file(void)
 {
-        char **p, *ini_file;
+        char  *ini_file;
 
         if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL ||
-            (ini_file = default_file_in_path()) != NULL)
+            (ini_file = default_file_in_path()) != NULL) {
                 return ini_file;
-        for (p = default_ini_path_names; *p != NULL; p++)
-                if (access(*p, F_OK) == 0)
+        }
+
+        for (char **p = default_ini_path_names; *p != NULL; p++) {
+                if (access(*p, F_OK) == 0) {
                         return *p;
+                }
+        }
         return NULL;
 }
 
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 40aa020d..a80229e2 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
 
 EXTRA_DIST = t pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -80,8 +80,8 @@ install-exec-local: $(noinst_PROGRAMS)
 
 ##############################################################################
 # the actual targets
-check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
-check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
+check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO)
+check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO)
 
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 6b07df51..4b8f5e27 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -497,7 +497,7 @@ int send_dhcp_discover(int sock){
                 memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address));
                 opts += sizeof(requested_address);
         }
-        discover_packet.options[opts++]=DHCP_OPTION_END;
+        discover_packet.options[opts++]= (char)DHCP_OPTION_END;
 
         /* unicast fields */
         if(unicast)
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 8f9a21d2..fbb197f7 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -223,6 +223,7 @@ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
 int curl_http_version = CURL_HTTP_VERSION_NONE;
 bool automatic_decompression = false;
 char *cookie_jar_file = NULL;
+bool haproxy_protocol = false;
 
 bool process_arguments (int, char**);
 void handle_curl_option_return_code (CURLcode res, const char* option);
@@ -520,6 +521,11 @@ check_http (void)
   handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT");
   handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT");
 
+  /* enable haproxy protocol */
+  if (haproxy_protocol) {
+    handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL");
+  }
+
   // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy
   if(use_ssl && host_name != NULL) {
       if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) {
@@ -1384,7 +1390,8 @@ process_arguments (int argc, char **argv)
     CA_CERT_OPTION,
     HTTP_VERSION_OPTION,
     AUTOMATIC_DECOMPRESSION,
-    COOKIE_JAR
+    COOKIE_JAR,
+    HAPROXY_PROTOCOL
   };
 
   int option = 0;
@@ -1431,6 +1438,7 @@ process_arguments (int argc, char **argv)
     {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
     {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
     {"cookie-jar", required_argument, 0, COOKIE_JAR},
+    {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
     {0, 0, 0, 0}
   };
 
@@ -1841,6 +1849,9 @@ process_arguments (int argc, char **argv)
     case COOKIE_JAR:
       cookie_jar_file = optarg;
       break;
+    case HAPROXY_PROTOCOL:
+      haproxy_protocol = true;
+      break;
     case '?':
       /* print short usage statement if args not parsable */
       usage5 ();
@@ -2060,6 +2071,8 @@ print_help (void)
   printf ("    %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
   printf (" %s\n", "--enable-automatic-decompression");
   printf ("    %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
+  printf(" %s\n", "--haproxy-protocol");
+  printf("    %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
   printf (" %s\n", "---cookie-jar=FILE");
   printf ("    %s\n", _("Store cookies in the cookie jar and send them out when requested."));
   printf ("\n");
@@ -2144,7 +2157,7 @@ print_usage (void)
   printf ("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
   printf ("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
   printf ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
-  printf ("       [-A string] [-k string] [-S <version>] [--sni]\n");
+  printf ("       [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n");
   printf ("       [-T <content-type>] [-j method]\n");
   printf ("       [--http-version=<version>] [--enable-automatic-decompression]\n");
   printf ("       [--cookie-jar=<cookie jar file>\n");
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 110f1188..425ce86b 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -472,9 +472,8 @@ bool process_arguments (int argc, char **argv)
       http_method = strdup (optarg);
       char *tmp;
       if ((tmp = strstr(http_method, ":")) != NULL) {
-        tmp[0] = '\0';
-        http_method = http_method;
-        http_method_proxy = ++tmp;
+        tmp[0] = '\0'; // set the ":" in the middle to 0
+        http_method_proxy = ++tmp; // this points to the second part
       }
       break;
     case 'd': /* string or substring */
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 7ee9d0ca..295aa9b5 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -691,7 +691,6 @@ process_arguments (int argc, char **argv)
 {
         char *ptr;
         int c = 1;
-        int ii = 0;
         size_t j = 0, jj = 0;
 
         int option = 0;
@@ -848,7 +847,6 @@ process_arguments (int argc, char **argv)
                         numoids = j;
                         if (c == 'E' || c == 'e') {
                                 jj++;
-                                ii++;
                                 while (j+1 >= eval_size) {
                                         eval_size += OID_COUNT_STEP;
                                         eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
@@ -875,7 +873,6 @@ process_arguments (int argc, char **argv)
                                 memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
                         }
                         eval_method[jj++] = CRIT_STRING;
-                        ii++;
                         break;
                 case 'R':                                                                       /* regex */
                         cflags = REG_ICASE;
@@ -896,7 +893,6 @@ process_arguments (int argc, char **argv)
                                 memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
                         }
                         eval_method[jj++] = CRIT_REGEX;
-                        ii++;
                         break;
 
         /* Format */
diff --git a/plugins/popen.c b/plugins/popen.c
index 036bc608..54e63bc5 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -105,7 +105,7 @@ spopen (const char *cmdstring)
 #endif
 
         env[0] = strdup("LC_ALL=C");
-        env[1] = '\0';
+        env[1] = NULL;
 
         /* if no command was passed, return with no error */
         if (cmdstring == NULL)
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 32fd6b96..ed49bb99 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -115,7 +115,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         if(!np_pids) NP_RUNCMD_INIT;
 
         env[0] = strdup("LC_ALL=C");
-        env[1] = '\0';
+        env[1] = NULL;
 
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */