From 917fcc7c302f67b42482a1a3e16e62f3b39d4e80 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Wed, 20 May 2009 00:20:11 -0400 Subject: Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) --- NEWS | 1 + THANKS.in | 1 + plugins/check_mysql.c | 8 ++++---- plugins/check_mysql_query.c | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index c5b591a9..a7830252 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,7 @@ This file documents the major additions and syntax changes between releases. Fixed segfault in check_mysql with old slaves (#2696823 - Oskar Ahner) check_nt can return UNKNOWN on timeouts (-u) Fixed typos for check_disk (Chris Pepper) + Fixed check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) - Specify an empty password explicitly if you need to override it. 1.4.13 25th Sept 2008 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) diff --git a/THANKS.in b/THANKS.in index 5417f66c..4fe6425b 100644 --- a/THANKS.in +++ b/THANKS.in @@ -250,3 +250,4 @@ Richard Edward Horner John Barbuto Oskar Ahner Chris Pepper +Ben Timby 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)); -- cgit v1.2.3-74-g34f1