diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-05-20 00:20:11 -0400 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-05-20 00:20:11 -0400 |
| commit | 917fcc7c302f67b42482a1a3e16e62f3b39d4e80 (patch) | |
| tree | c8f54e0bd1aee7fe8352dcdf05f8d166f2025372 /plugins | |
| parent | 50b3ff7b91e78a61aca93247bee586d6d7eb27c8 (diff) | |
| download | monitoring-plugins-917fcc7c302f67b42482a1a3e16e62f3b39d4e80.tar.gz | |
Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_mysql.c | 8 | ||||
| -rw-r--r-- | plugins/check_mysql_query.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 689648eb..05d2b019 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c @@ -5,7 +5,7 @@ * License: GPL * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) -* Copyright (c) 1999-2007 Nagios Plugins Development Team +* Copyright (c) 1999-2009 Nagios Plugins Development Team * * Description: * @@ -358,9 +358,6 @@ validate_arguments (void) if (db_host == NULL) db_host = strdup(""); - if (db_pass == NULL) - db_pass = strdup(""); - if (db == NULL) db = strdup(""); @@ -417,6 +414,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)); diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 802e3456..47dd8616 100644 --- 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)); |