![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index ad15a77c96c47824a6883e2490a23fd13c90fb24..a9f0f600bc9964d2d81ceba735c6f0a4c09a12f7 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
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;
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"));
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, "%s\n", mysql_error (&mysql));
else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
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'},
return ERROR;
while (1) {
- c = getopt_long (argc, argv, "hvVSP:p:u:d:H:c:w:", longopts, &option);
+ c = getopt_long (argc, argv, "hvVSP:p:u:d:H:s:c:w:", longopts, &option);
if (c == -1 || c == EOF)
break;
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 */
- db_pass = optarg;
+ db_pass = strdup(optarg);
+
+ /* Delete the password from process list */
+ while (*optarg != '\0') {
+ *optarg = 'X';
+ optarg++;
+ }
break;
case 'P': /* critical time threshold */
db_port = atoi (optarg);
printf ("%s\n", _("This program tests connections to a mysql server"));
printf ("\n\n");
-
+
print_usage ();
- printf (_(UT_HELP_VRSN));
+ printf (_(UT_HELP_VRSN));
+ printf (_(UT_EXTRA_OPTS));
- printf (_(UT_HOST_PORT), 'P', myport);
+ 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 (" %s\n", "-d, --database=STRING");
+ printf (" %s\n", "-d, --database=STRING");
printf (" %s\n", _("Check database with indicated name"));
printf (" %s\n", "-u, --username=STRING");
printf (" %s\n", _("Connect using the indicated username"));
printf (" %s\n", "-p, --password=STRING");
printf (" %s\n", _("Use the indicated password to authenticate the connection"));
- printf (" %s\n", _("==> IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!! <=="));
- printf (" %s\n", _("Your clear-text password will be visible as a process table entry"));
+ 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 (" %s\n", "-S, --check-slave");
printf (" %s\n", _("Check if the slave thread is running properly."));
printf (" %s\n", "-w, --warning");
- printf (" %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds behind master"));
+ printf (" %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds"));
+ printf (" %s\n", _("behind master"));
printf (" %s\n", "-c, --critical");
- printf (" %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds behind master"));
- printf (" %s\n", _("There are no required arguments. By default, the local database with"));
- printf (_("a server listening on MySQL standard port %d will be checked\n"), MYSQL_PORT);
+ printf (" %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
+ printf (" %s\n", _("behind master"));
+
+ printf ("\n");
+ printf (" %s\n", _("There are no required arguments. By default, the local database is checked"));
+ printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
+ printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
+
+#ifdef NP_EXTRA_OPTS
+ printf ("\n");
+ printf ("%s\n", _("Notes:"));
+ printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
printf (_(UT_SUPPORT));
}
print_usage (void)
{
printf (_("Usage:"));
- printf ("%s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",progname);
+ printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname);
+ printf (" [-u user] [-p password] [-S]\n");
}