check_host: Allocate a large-enough buffer for the host table.

[nagiosplug.git] / plugins / check_mysql_query.c

diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index a168306600c2710d0abfad9ade72c1b7f83f8533..cf9d8dfb2db227cd96e5f1eb50c2d86d7f87d8ef 100644 (file)
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -3,11 +3,9 @@
 * 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
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_mysql_query plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_mysql_query";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -47,6 +43,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 char *db_user = NULL;
 char *db_host = NULL;
+char *db_socket = NULL;
 char *db_pass = NULL;
 char *db = NULL;
 unsigned int db_port = MYSQL_PORT;
@@ -77,6 +74,9 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -86,7 +86,7 @@ main (int argc, char **argv)
        mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
 
        /* establish a connection to the server and error checking */
-       if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,NULL,0)) {
+       if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
                if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
                else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
@@ -170,6 +170,7 @@ process_arguments (int argc, char **argv)
        int option = 0;
        static struct option longopts[] = {
                {"hostname", required_argument, 0, 'H'},
+               {"socket", required_argument, 0, 's'},
                {"database", required_argument, 0, 'd'},
                {"username", required_argument, 0, 'u'},
                {"password", required_argument, 0, 'p'},
@@ -187,7 +188,7 @@ process_arguments (int argc, char **argv)
                return ERROR;
 
        while (1) {
-               c = getopt_long (argc, argv, "hvVSP:p:u:d:H:q:w:c:", longopts, &option);
+               c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option);
 
                if (c == -1 || c == EOF)
                        break;
@@ -201,14 +202,17 @@ process_arguments (int argc, char **argv)
                                usage2 (_("Invalid hostname/address"), optarg);
                        }
                        break;
-               case 'd':                                                                       /* hostname */
+               case 's':                                                                       /* socket */
+                       db_socket = optarg;
+                       break;
+               case 'd':                                                                       /* database */
                        db = optarg;
                        break;
                case 'u':                                                                       /* username */
                        db_user = optarg;
                        break;
                case 'p':                                                                       /* authentication information: password */
-                       asprintf(&db_pass, "%s", optarg);
+                       db_pass = strdup(optarg);
 
                        /* Delete the password from process list */
                        while (*optarg != '\0') {
@@ -223,7 +227,7 @@ process_arguments (int argc, char **argv)
                        verbose++;
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -262,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("");
 
@@ -278,7 +279,7 @@ print_help (void)
        char *myport;
        asprintf (&myport, "%d", MYSQL_PORT);
 
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf (_(COPYRIGHT), copyright, email);
 
@@ -288,11 +289,14 @@ print_help (void)
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
        printf (" -q, --query=STRING\n");
        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-       printf (_(UT_WARN_CRIT_RANGE));
-       printf (_(UT_HOST_PORT), 'P', myport);
+       printf (UT_WARN_CRIT_RANGE);
+       printf (UT_HOST_PORT, 'P', myport);
+       printf (" %s\n", "-s, --socket=STRING");
+       printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
        printf (" -d, --database=STRING\n");
        printf ("    %s\n", _("Database to check"));
        printf (" -u, --username=STRING\n");
@@ -300,20 +304,25 @@ print_help (void)
        printf (" -p, --password=STRING\n");
        printf ("    %s\n", _("Password to login with"));
        printf ("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
+       printf ("    %s\n", _("Your clear-text password could be visible as a process table entry"));
 
        printf ("\n");
+       printf (" %s\n", _("A query is required. The result from the query should be numeric."));
+       printf (" %s\n", _("For extra security, create a user with minimal access."));
 
-       printf ("%s\n", _("A query is required. The result from the query should be numeric."));
-       printf ("%s\n", _("For extra security, create a user with minimal access."));
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+       printf (" %s\n", _("overriding any my.cnf settings."));
 
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
-       printf ("%s -q SQL_query [-w warn] [-c crit]\n",progname);
-  printf ("[-d database] [-H host] [-P port] [-u user] [-p password]\n");
+  printf ("%s\n", _("Usage:"));
+  printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname);
+  printf ("       [-d database] [-u user] [-p password]\n");
 }