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/check_mysql_query.c | |
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/check_mysql_query.c')
-rw-r--r-- | plugins/check_mysql_query.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ | |||
3 | * Nagios check_mysql_query plugin | 3 | * Nagios check_mysql_query plugin |
4 | * | 4 | * |
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 2006-2007 Nagios Plugins Development Team | 6 | * Copyright (c) 2006-2009 Nagios Plugins Development Team |
7 | * Original code from check_mysql, copyright 1999 Didi Rieder | 7 | * Original code from check_mysql, copyright 1999 Didi Rieder |
8 | * | 8 | * |
9 | * Description: | 9 | * Description: |
@@ -266,9 +266,6 @@ validate_arguments (void) | |||
266 | if (db_host == NULL) | 266 | if (db_host == NULL) |
267 | db_host = strdup(""); | 267 | db_host = strdup(""); |
268 | 268 | ||
269 | if (db_pass == NULL) | ||
270 | db_pass = strdup(""); | ||
271 | |||
272 | if (db == NULL) | 269 | if (db == NULL) |
273 | db = strdup(""); | 270 | db = strdup(""); |
274 | 271 | ||
@@ -317,6 +314,9 @@ print_help (void) | |||
317 | printf ("\n"); | 314 | printf ("\n"); |
318 | printf ("%s\n", _("Notes:")); | 315 | printf ("%s\n", _("Notes:")); |
319 | printf (_(UT_EXTRA_OPTS_NOTES)); | 316 | printf (_(UT_EXTRA_OPTS_NOTES)); |
317 | printf ("\n"); | ||
318 | printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); | ||
319 | printf (" %s\n", _("overriding any my.cnf settings.")); | ||
320 | #endif | 320 | #endif |
321 | 321 | ||
322 | printf (_(UT_SUPPORT)); | 322 | printf (_(UT_SUPPORT)); |