Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby)

[nagiosplug.git] / plugins / check_mysql_query.c

diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 802e345611114be73825d39f7b411d56f03fdf2a..47dd86163daee69a0381b0f4e2d92c238713935a 100644 (file)
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -3,7 +3,7 @@
 * Nagios check_mysql_query plugin
 * 
 * License: GPL
-* Copyright (c) 2006-2007 Nagios Plugins Development Team
+* Copyright (c) 2006-2009 Nagios Plugins Development Team
 * Original code from check_mysql, copyright 1999 Didi Rieder
 * 
 * Description:
@@ -266,9 +266,6 @@ validate_arguments (void)
        if (db_host == NULL)
                db_host = strdup("");
 
-       if (db_pass == NULL)
-               db_pass = strdup("");
-
        if (db == NULL)
                db = strdup("");
 
@@ -317,6 +314,9 @@ print_help (void)
        printf ("\n");
        printf ("%s\n", _("Notes:"));
        printf (_(UT_EXTRA_OPTS_NOTES));
+       printf ("\n");
+       printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+       printf (" %s\n", _("overriding any my.cnf settings."));
 #endif
 
        printf (_(UT_SUPPORT));