Bulk EOL cleanup

[nagiosplug.git] / plugins / check_mysql.c

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 3d7426d81db23c967164753a937680eaa97da7d3..77f3b89b43c382e7e0b4e2be155d45d3c07f3a2d 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -71,9 +71,9 @@ main (int argc, char **argv)
        MYSQL mysql;
        MYSQL_RES *res;
        MYSQL_ROW row;
-       
+
        /* should be status */
-       
+
        char *result = NULL;
        char *error = NULL;
        char slaveresult[SLAVERESULTSIZE];
@@ -82,6 +82,9 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -183,7 +186,7 @@ main (int argc, char **argv)
                                mysql_close (&mysql);
                                die (STATE_CRITICAL, "Slave status unavailable\n");
                        }
-                       
+
                        snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], row[seconds_behind_field]);
                        if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
                                mysql_free_result (res);
@@ -359,7 +362,7 @@ validate_arguments (void)
                db_host = strdup("");
 
        if (db_pass == NULL)
-               db_pass == strdup("");
+               db_pass = strdup("");
 
        if (db == NULL)
                db = strdup("");
@@ -385,6 +388,7 @@ print_help (void)
        print_usage ();
 
   printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
   printf (_(UT_HOST_PORT), 'P', myport);
   printf (" %s\n", "-s, --socket=STRING");
@@ -412,6 +416,12 @@ print_help (void)
   printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
   printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
 
+#ifdef NP_EXTRA_OPTS
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
+
        printf (_(UT_SUPPORT));
 }