summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2009-05-20 04:20:11 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2009-05-20 04:20:11 (GMT)
commit917fcc7c302f67b42482a1a3e16e62f3b39d4e80 (patch)
treec8f54e0bd1aee7fe8352dcdf05f8d166f2025372
parent50b3ff7b91e78a61aca93247bee586d6d7eb27c8 (diff)
downloadmonitoring-plugins-917fcc7c302f67b42482a1a3e16e62f3b39d4e80.tar.gz
Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby)
-rw-r--r--NEWS1
-rw-r--r--THANKS.in1
-rw-r--r--plugins/check_mysql.c8
-rw-r--r--plugins/check_mysql_query.c8
4 files changed, 10 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index c5b591a..a783025 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ This file documents the major additions and syntax changes between releases.
32 Fixed segfault in check_mysql with old slaves (#2696823 - Oskar Ahner) 32 Fixed segfault in check_mysql with old slaves (#2696823 - Oskar Ahner)
33 check_nt can return UNKNOWN on timeouts (-u) 33 check_nt can return UNKNOWN on timeouts (-u)
34 Fixed typos for check_disk (Chris Pepper) 34 Fixed typos for check_disk (Chris Pepper)
35 Fixed check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) - Specify an empty password explicitly if you need to override it.
35 36
361.4.13 25th Sept 2008 371.4.13 25th Sept 2008
37 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) 38 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
diff --git a/THANKS.in b/THANKS.in
index 5417f66..4fe6425 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -250,3 +250,4 @@ Richard Edward Horner
250John Barbuto 250John Barbuto
251Oskar Ahner 251Oskar Ahner
252Chris Pepper 252Chris Pepper
253Ben Timby
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 689648e..05d2b01 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -5,7 +5,7 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) 6* Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) 7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
8* Copyright (c) 1999-2007 Nagios Plugins Development Team 8* Copyright (c) 1999-2009 Nagios Plugins Development Team
9* 9*
10* Description: 10* Description:
11* 11*
@@ -358,9 +358,6 @@ validate_arguments (void)
358 if (db_host == NULL) 358 if (db_host == NULL)
359 db_host = strdup(""); 359 db_host = strdup("");
360 360
361 if (db_pass == NULL)
362 db_pass = strdup("");
363
364 if (db == NULL) 361 if (db == NULL)
365 db = strdup(""); 362 db = strdup("");
366 363
@@ -417,6 +414,9 @@ print_help (void)
417 printf ("\n"); 414 printf ("\n");
418 printf ("%s\n", _("Notes:")); 415 printf ("%s\n", _("Notes:"));
419 printf (_(UT_EXTRA_OPTS_NOTES)); 416 printf (_(UT_EXTRA_OPTS_NOTES));
417 printf ("\n");
418 printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
419 printf (" %s\n", _("overriding any my.cnf settings."));
420#endif 420#endif
421 421
422 printf (_(UT_SUPPORT)); 422 printf (_(UT_SUPPORT));
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 802e345..47dd861 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));