23 files changed, 50 insertions, 32 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a35f273e..9aefcea0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -166,7 +166,7 @@ check_real_LDADD = $(NETLIBS)
 check_snmp_SOURCES = check_snmp.c check_snmp.d/check_snmp_helpers.c
 check_snmp_LDADD = $(BASEOBJS)
 check_snmp_LDFLAGS = $(AM_LDFLAGS) -lm `net-snmp-config --libs`
-check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags`
+check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags | sed 's/-Werror=declaration-after-statement//' | sed 's/-Wundef//'`
 check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
 check_swap_SOURCES = check_swap.c check_swap.d/swap.c
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 1cbdcd60..92c3827a 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -175,7 +175,7 @@ check_cluster_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "hHsvVw:c:d:l:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 1dec8a2a..0bc5f9b0 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -946,7 +946,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index = getopt_long(
                         argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB",
                         longopts, &option);
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 9ea19e6a..9ec8028a 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -284,7 +284,7 @@ check_dig_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:E:X:46", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index e1a2baff..4ec1b211 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -448,7 +448,7 @@ check_disk_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index = getopt_long(
                         argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 6160c2cb..86ef64a4 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -361,7 +361,7 @@ check_fping_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 974a7253..48ec6883 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -186,7 +186,7 @@ check_game_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 9907abc5..883f1df0 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -299,7 +299,7 @@ check_hpjd_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "+hVH:C:p:D", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index c1325cf9..43731039 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -169,7 +169,7 @@ static check_ide_smart_config_wrapper process_arguments(int argc, char **argv) {
                 int longindex = 0;
                 int option_index = getopt_long(argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 1b2e2826..300a0dc1 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -362,7 +362,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 644cd604..60fa646f 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -295,7 +295,7 @@ static check_load_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 int option_index = getopt_long(argc, argv, "Vhrc:w:n:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 26730d4c..20b4ac3f 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -504,7 +504,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a46dc1ed..e2f230c9 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -227,7 +227,7 @@ check_nagios_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "+hVvF:C:e:t:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 61feb958..cb9e8f57 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -221,7 +221,7 @@ check_ping_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index ae6e9c23..01476504 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -432,7 +432,7 @@ check_procs_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 93352bcc..6e062ff8 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -332,7 +332,7 @@ check_radius_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 int option_index = getopt_long(argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_real.d/config.h b/plugins/check_real.d/config.h
index 2d99ad49..314aff37 100644
--- a/plugins/check_real.d/config.h
+++ b/plugins/check_real.d/config.h
@@ -9,7 +9,7 @@ enum {
         PORT = 554
 };
 
-const char *default_expect = "RTSP/1.";
+char *default_expect = "RTSP/1.";
 
 typedef struct {
         char *server_address;
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index f470d222..2b3099c9 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -116,6 +116,7 @@ gen_state_string_type gen_state_string(check_snmp_state_entry *entries, size_t n
                                 break;
                         case ASN_FLOAT:
                                 printf("Type FLOAT\n");
+                                break;
                         case ASN_DOUBLE:
                                 printf("Type DOUBLE\n");
                                 break;
@@ -217,6 +218,7 @@ recover_state_data_type recover_state_data(char *state_string, idx_t state_strin
                                 break;
                         case ASN_FLOAT:
                                 printf("Type FLOAT\n");
+                                break;
                         case ASN_DOUBLE:
                                 printf("Type DOUBLE\n");
                                 break;
@@ -254,7 +256,10 @@ int main(int argc, char **argv) {
 
         timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
-        np_init((char *)progname, argc, argv);
+        char progname_copy[256];
+        strncpy(progname_copy, progname, sizeof(progname_copy)-1);
+        progname_copy[255] = '\0';
+        np_init(progname_copy, argc, argv);
 
         state_key stateKey = np_enable_state(NULL, 1, progname, argc, argv);
 
@@ -445,7 +450,7 @@ static process_arguments_wrapper process_arguments(int argc, char **argv) {
                         argc, argv,
                         "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
@@ -506,8 +511,8 @@ static process_arguments_wrapper process_arguments(int argc, char **argv) {
         unsigned char *privpasswd = NULL;
         int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
         char *port = NULL;
-        char *miblist = NULL;
-        char *connection_prefix = NULL;
+        const char *miblist = NULL;
+        const char *connection_prefix = NULL;
         bool snmp_version_set_explicitely = false;
         // TODO error checking
         while (true) {
@@ -515,7 +520,7 @@ static process_arguments_wrapper process_arguments(int argc, char **argv) {
                         argc, argv,
                         "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
diff --git a/plugins/check_snmp.d/check_snmp_helpers.c b/plugins/check_snmp.d/check_snmp_helpers.c
index 2dfc88b5..d680678a 100644
--- a/plugins/check_snmp.d/check_snmp_helpers.c
+++ b/plugins/check_snmp.d/check_snmp_helpers.c
@@ -91,6 +91,8 @@ const char DEFAULT_OUTPUT_DELIMITER[] = " ";
 
 const int RANDOM_STATE_DATA_LENGTH_PREDICTION = 8192;
 
+char community[100];
+
 check_snmp_config check_snmp_config_init() {
         check_snmp_config tmp = {
                 .snmp_params =
@@ -129,14 +131,17 @@ check_snmp_config check_snmp_config_init() {
         tmp.snmp_params.snmp_session.retries = DEFAULT_RETRIES;
         tmp.snmp_params.snmp_session.version = DEFAULT_SNMP_VERSION;
         tmp.snmp_params.snmp_session.securityLevel = SNMP_SEC_LEVEL_NOAUTH;
-        tmp.snmp_params.snmp_session.community = (unsigned char *)"public";
-        tmp.snmp_params.snmp_session.community_len = strlen("public");
+        strcpy(community, "public");
+        tmp.snmp_params.snmp_session.community = (unsigned char *)community;
+        tmp.snmp_params.snmp_session.community_len = strlen(community);
         return tmp;
 }
 
 snmp_responces do_snmp_query(check_snmp_config_snmp_parameters parameters) {
         if (parameters.ignore_mib_parsing_errors) {
-                char *opt_toggle_res = snmp_mib_toggle_options("e");
+                char option_e[2];
+                option_e[0] = 'e'; option_e[1] = '\0';
+                char *opt_toggle_res = snmp_mib_toggle_options(option_e);
                 if (opt_toggle_res != NULL) {
                         die(STATE_UNKNOWN, "Unable to disable MIB parsing errors");
                 }
@@ -436,7 +441,7 @@ check_snmp_evaluation evaluate_single_unit(response_value response,
                         }
                 } else {
                         // It's only a counter if we cont compute rate
-                        pd_num_val.uom = "c";
+                        pd_num_val.uom = strdup("c");
                         pd_result_val = mp_create_pd_value(response.value.uIntVal);
                 }
                 break;
@@ -476,7 +481,7 @@ check_snmp_evaluation evaluate_single_unit(response_value response,
                         pd_result_val = mp_create_pd_value(treated_value);
 
                         if (response.type == ASN_COUNTER) {
-                                pd_num_val.uom = "c";
+                                pd_num_val.uom = strdup("c");
                         }
                 }
 
@@ -820,7 +825,7 @@ state_data *np_state_read(state_key stateKey) {
  *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
  *   statically compiled shared state directory
  */
-char *_np_state_calculate_location_prefix(void) {
+static const char *_np_state_calculate_location_prefix(void) {
         char *env_dir;
 
         /* Do not allow passing MP_STATE_PATH in setuid plugins
@@ -871,7 +876,7 @@ state_key np_enable_state(char *keyname, int expected_data_version, const char *
                 tmp_char++;
         }
         this_state->name = temp_keyname;
-        this_state->plugin_name = (char *)plugin_name;
+        this_state->plugin_name = strdup(plugin_name);
         this_state->data_version = expected_data_version;
         this_state->state_data = NULL;
 
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 09806373..ec334941 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -550,7 +550,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                 int option_index =
                         getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 99708ad3..aec995d4 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -213,7 +213,7 @@ check_time_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 option_char = getopt_long(argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
diff --git a/plugins/common.h b/plugins/common.h
index ef888d08..9d1434a3 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -193,7 +193,7 @@ enum {
  */
 #include "../gl/gettext.h"
 #define _(String) gettext(String)
-#if !ENABLE_NLS
+#if !defined(ENABLE_NLS) || !ENABLE_NLS
 #       undef textdomain
 #       define textdomain(Domainname) /* empty */
 #       undef bindtextdomain
@@ -205,4 +205,11 @@ enum {
 #       define __attribute__(x) /* do nothing */
 #endif
 
+/* for checking the result of getopt_long */
+#if EOF == -1
+#define CHECK_EOF(c) ((c) == EOF)
+#else
+#define CHECK_EOF(c) ((c) == -1 || (c) == EOF)
+#endif
+
 #endif /* _COMMON_H_ */
diff --git a/plugins/utils.h b/plugins/utils.h
index 68ff1630..c1c921fb 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -13,6 +13,7 @@ in order to resist overflow attacks. In addition, a few functions are
 provided to standardize version and error reporting across the entire
 suite of plugins. */
 
+#undef USE_OPENSSL // net-snmp defines USE_OPENSSL as NETSNMP_USE_OPENSSL in net-snmp-config.h
 #include "../config.h"
 #include <stdbool.h>
 #include <stdint.h>