[Nagiosplug-checkins] nagiosplug/plugins check_by_ssh.c,1.26,1.27 check_dig.c,1.31,1.32 check_dns.c,1.35,1.36 check_dummy.c,1.9,1.10 check_fping.c,1.18,1.19 check_game.c,1.15,1.16 check_hpjd.c,1.24,1.25 check_ide-smart.c,1.7,1.8 check_ldap.c,1.21,1.22 check_load.c,1.20,1.21 check_mrtg.c,1.17,1.18 check_mrtgtraf.c,1.18,1.19 check_mysql.c,1.19,1.20 check_nagios.c,1.16,1.17 check_nt.c,1.29,1.30 check_nwstat.c,1.20,1.21 check_overcr.c,1.13,1.14 check_pgsql.c,1.22,1.23 check_ping.c,1.33,1.34 check_procs.c,1.34,1.35 check_radius.c,1.15,1.16 check_real.c,1.18,1.19 check_smtp.c,1.32,1.33 check_snmp.c,1.43,1.44 check_ssh.c,1.20,1.21 check_swap.c,1.35,1.36 check_tcp.c,1.49,1.50 check_time.c,1.18,1.19 check_udp.c,1.17,1.18 check_ups.c,1.20,1.21 check_users.c,1.14,1.15 negate.c,1.19,1.20 urlize.c,1.13,1.14
Benoit Mortier
opensides at users.sourceforge.net
Thu Dec 2 16:56:05 CET 2004
Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26648/plugins
Modified Files:
check_by_ssh.c check_dig.c check_dns.c check_dummy.c
check_fping.c check_game.c check_hpjd.c check_ide-smart.c
check_ldap.c check_load.c check_mrtg.c check_mrtgtraf.c
check_mysql.c check_nagios.c check_nt.c check_nwstat.c
check_overcr.c check_pgsql.c check_ping.c check_procs.c
check_radius.c check_real.c check_smtp.c check_snmp.c
check_ssh.c check_swap.c check_tcp.c check_time.c check_udp.c
check_ups.c check_users.c negate.c urlize.c
Log Message:
bump copyright year
initialize result to STATE_UNKNOW in place of STATE_OK
Index: check_mrtg.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtg.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_mrtg.c 2 Dec 2004 16:51:24 -0000 1.17
+++ check_mrtg.c 3 Dec 2004 00:55:27 -0000 1.18
@@ -20,7 +20,7 @@
const char *progname = "check_mrtg";
const char *revision = "$Revision$";
-const char *copyright = "1999-2001";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -43,7 +43,7 @@
int
main (int argc, char **argv)
{
- int result = STATE_OK;
+ int result = STATE_UNKNOWN;
FILE *fp;
int line;
char input_buffer[MAX_INPUT_BUFFER];
@@ -152,7 +152,9 @@
return result;
}
-
+
+
+
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
@@ -210,7 +212,7 @@
case 'v':
variable_number = atoi (optarg);
if (variable_number < 1 || variable_number > 2)
- usage (_("Invalid variable number\n"));
+ usage4 (_("Invalid variable number"));
break;
case 'w': /* critical time threshold */
value_warning_threshold = strtoul (optarg, NULL, 10);
@@ -291,7 +293,7 @@
validate_arguments (void)
{
if (variable_number == -1)
- usage (_("You must supply the variable number\n"));
+ usage4 (_("You must supply the variable number"));
if (label == NULL)
label = strdup ("value");
Index: check_dummy.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dummy.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- check_dummy.c 1 Dec 2004 23:54:51 -0000 1.9
+++ check_dummy.c 3 Dec 2004 00:55:27 -0000 1.10
@@ -18,14 +18,14 @@
******************************************************************************/
-#include "common.h"
-#include "utils.h"
-
const char *progname = "check_dummy";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
+#include "common.h"
+#include "utils.h"
+
void print_help (void);
void print_usage (void);
@@ -34,7 +34,7 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- check_tcp.c 2 Dec 2004 21:03:26 -0000 1.49
+++ check_tcp.c 3 Dec 2004 00:55:28 -0000 1.50
@@ -21,7 +21,7 @@
/* progname "check_tcp" changes depending on symlink called */
char *progname;
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -105,7 +105,7 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
int i;
char *status;
struct timeval tv;
Index: check_overcr.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_overcr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- check_overcr.c 2 Dec 2004 16:51:25 -0000 1.13
+++ check_overcr.c 3 Dec 2004 00:55:27 -0000 1.14
@@ -20,7 +20,7 @@
const char *progname = "check_overcr";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -63,7 +63,7 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
char recv_buffer[MAX_INPUT_BUFFER];
char temp_buffer[MAX_INPUT_BUFFER];
char *temp_ptr = NULL;
Index: check_radius.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_radius.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- check_radius.c 2 Dec 2004 16:51:25 -0000 1.15
+++ check_radius.c 3 Dec 2004 00:55:27 -0000 1.16
@@ -104,7 +104,7 @@
UINT4 service;
char msg[BUFFER_LEN];
SEND_DATA data;
- int result;
+ int result = STATE_UNKNOWN;
UINT4 client_id;
char *str;
Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_mrtgtraf.c 2 Dec 2004 16:51:24 -0000 1.18
+++ check_mrtgtraf.c 3 Dec 2004 00:55:27 -0000 1.19
@@ -23,7 +23,7 @@
const char *progname = "check_mrtgtraf";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
int process_arguments (int, char **);
@@ -43,7 +43,7 @@
int
main (int argc, char **argv)
{
- int result = STATE_OK;
+ int result = STATE_UNKNOWN;
FILE *fp;
int line;
char input_buffer[MAX_INPUT_BUFFER];
Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- check_by_ssh.c 2 Dec 2004 16:51:24 -0000 1.26
+++ check_by_ssh.c 3 Dec 2004 00:55:26 -0000 1.27
@@ -20,7 +20,7 @@
const char *progname = "check_by_ssh";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
Index: check_time.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_time.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_time.c 2 Dec 2004 16:51:25 -0000 1.18
+++ check_time.c 3 Dec 2004 00:55:28 -0000 1.19
@@ -18,15 +18,15 @@
******************************************************************************/
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
const char *progname = "check_time";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
enum {
TIME_PORT = 37
};
@@ -55,7 +55,7 @@
main (int argc, char **argv)
{
int sd;
- int result;
+ int result = STATE_UNKNOWN;
time_t conntime;
setlocale (LC_ALL, "");
Index: check_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_ssh.c 2 Dec 2004 16:51:25 -0000 1.20
+++ check_ssh.c 3 Dec 2004 00:55:28 -0000 1.21
@@ -18,15 +18,15 @@
******************************************************************************/
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
const char *progname = "check_ssh";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
#ifndef MSG_DONTWAIT
#define MSG_DONTWAIT 0
#endif
@@ -51,7 +51,7 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
@@ -62,6 +62,7 @@
/* initialize alarm signal handling */
signal (SIGALRM, socket_timeout_alarm_handler);
+
alarm (socket_timeout);
/* ssh_connect exits if error is found */
Index: check_udp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_udp.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_udp.c 2 Dec 2004 16:51:25 -0000 1.17
+++ check_udp.c 3 Dec 2004 00:55:28 -0000 1.18
@@ -20,7 +20,7 @@
const char *progname = "check_udp";
const char *revision = "$Revision$";
-const char *copyright = "1999-2002";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -44,7 +44,7 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
char recv_buffer[MAX_INPUT_BUFFER];
setlocale (LC_ALL, "");
@@ -63,6 +63,7 @@
time (&start_time);
result = process_udp_request (server_address, server_port, server_send,
recv_buffer, MAX_INPUT_BUFFER - 1);
+
time (&end_time);
if (result != STATE_OK) {
Index: check_fping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_fping.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_fping.c 2 Dec 2004 16:51:24 -0000 1.18
+++ check_fping.c 3 Dec 2004 00:55:27 -0000 1.19
@@ -20,7 +20,7 @@
const char *progname = "check_fping";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -57,6 +57,8 @@
int
main (int argc, char **argv)
{
+/* normaly should be int result = STATE_UNKNOWN; */
+
int status = STATE_UNKNOWN;
char *server = NULL;
char *command_line = NULL;
Index: check_users.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_users.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- check_users.c 2 Dec 2004 16:51:25 -0000 1.14
+++ check_users.c 3 Dec 2004 00:55:28 -0000 1.15
@@ -20,7 +20,7 @@
const char *progname = "check_users";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -40,7 +40,7 @@
main (int argc, char **argv)
{
int users = -1;
- int result = STATE_OK;
+ int result = STATE_UNKNOWN;
char input_buffer[MAX_INPUT_BUFFER];
char *perf;
Index: check_ping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- check_ping.c 2 Dec 2004 16:51:25 -0000 1.33
+++ check_ping.c 3 Dec 2004 00:55:27 -0000 1.34
@@ -20,7 +20,7 @@
const char *progname = "check_ping";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- check_dns.c 2 Dec 2004 21:23:50 -0000 1.35
+++ check_dns.c 3 Dec 2004 00:55:27 -0000 1.36
@@ -21,16 +21,16 @@
******************************************************************************/
-#include "common.h"
-#include "popen.h"
-#include "utils.h"
-#include "netutils.h"
-
const char *progname = "check_dns";
const char *revision = "$Revision$";
const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
+#include "common.h"
+#include "popen.h"
+#include "utils.h"
+#include "netutils.h"
+
int process_arguments (int, char **);
int validate_arguments (void);
int error_scan (char *);
Index: check_swap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_swap.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- check_swap.c 2 Dec 2004 16:51:25 -0000 1.35
+++ check_swap.c 3 Dec 2004 00:55:28 -0000 1.36
@@ -25,15 +25,15 @@
*
*****************************************************************************/
-#include "common.h"
-#include "popen.h"
-#include "utils.h"
-
const char *progname = "check_swap";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
+#include "common.h"
+#include "popen.h"
+#include "utils.h"
+
int check_swap (int usp, long unsigned int free_swap);
int process_arguments (int argc, char **argv);
int validate_arguments (void);
@@ -53,7 +53,7 @@
int percent_used, percent;
unsigned long long total_swap = 0, used_swap = 0, free_swap = 0;
unsigned long long dsktotal = 0, dskused = 0, dskfree = 0, tmp = 0;
- int result = STATE_OK;
+ int result = STATE_UNKNOWN;
char input_buffer[MAX_INPUT_BUFFER];
char *perf;
int conv_factor = SWAP_CONVERSION;
Index: check_hpjd.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_hpjd.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- check_hpjd.c 2 Dec 2004 16:51:24 -0000 1.24
+++ check_hpjd.c 3 Dec 2004 00:55:27 -0000 1.25
@@ -17,6 +17,11 @@
* $Id$
*****************************************************************************/
+const char *progname = "check_hpjd";
+const char *revision = "$Revision$";
+const char *copyright = "2000-2004";
+const char *email = "nagiosplug-devel at lists.sourceforge.net";
+
#include "common.h"
#include "popen.h"
#include "utils.h"
@@ -24,10 +29,6 @@
#define DEFAULT_COMMUNITY "public"
-const char *progname = "check_hpjd";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
-const char *email = "nagiosplug-devel at lists.sourceforge.net";
const char *option_summary = "-H host [-C community]\n";
@@ -59,7 +60,7 @@
main (int argc, char **argv)
{
char command_line[1024];
- int result;
+ int result = STATE_UNKNOWN;
int line;
char input_buffer[MAX_INPUT_BUFFER];
char query_string[512];
@@ -85,7 +86,7 @@
textdomain (PACKAGE);
if (process_arguments (argc, argv) != TRUE)
- usage4 (_("Could not parse arguments\n"));
+ usage4 (_("Could not parse arguments"));
/* removed ' 2>1' at end of command 10/27/1999 - EG */
/* create the query string */
Index: check_snmp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_snmp.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- check_snmp.c 2 Dec 2004 16:51:25 -0000 1.43
+++ check_snmp.c 3 Dec 2004 00:55:28 -0000 1.44
@@ -20,7 +20,7 @@
const char *progname = "check_snmp";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
Index: check_ide-smart.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ide-smart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- check_ide-smart.c 2 Dec 2004 01:11:00 -0000 1.7
+++ check_ide-smart.c 3 Dec 2004 00:55:27 -0000 1.8
@@ -36,9 +36,15 @@
*
* $Id$
*/
+
+const char *progname = "check_ide_smart";
+const char *revision = "$Revision$";
+const char *copyright = "2000-2004";
+const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
#include "utils.h"
+
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_real.c 2 Dec 2004 16:51:25 -0000 1.18
+++ check_real.c 3 Dec 2004 00:55:27 -0000 1.19
@@ -20,7 +20,7 @@
const char *progname = "check_real";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -56,7 +56,7 @@
main (int argc, char **argv)
{
int sd;
- int result;
+ int result = STATE_UNKNOWN;
char buffer[MAX_INPUT_BUFFER];
char *status_line = NULL;
Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_mysql.c 2 Dec 2004 16:51:24 -0000 1.19
+++ check_mysql.c 3 Dec 2004 00:55:27 -0000 1.20
@@ -16,7 +16,7 @@
const char *progname = "check_mysql";
const char *revision = "$Revision$";
-const char *copyright = "1999-2002";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#define SLAVERESULTSIZE 40
@@ -24,6 +24,7 @@
#include "common.h"
#include "utils.h"
#include "netutils.h"
+
#include <mysql/mysql.h>
#include <mysql/errmsg.h>
@@ -48,6 +49,9 @@
MYSQL mysql;
MYSQL_RES *res;
MYSQL_ROW row;
+
+ /* should be status */
+
char *result = NULL;
char slaveresult[SLAVERESULTSIZE];
Index: check_dig.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dig.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- check_dig.c 2 Dec 2004 16:51:24 -0000 1.31
+++ check_dig.c 3 Dec 2004 00:55:27 -0000 1.32
@@ -18,6 +18,11 @@
*****************************************************************************/
+const char *progname = "check_dig";
+const char *revision = "$Revision$";
+const char *copyright = "2002-2003";
+const char *email = "nagiosplug-devel at lists.sourceforge.net";
+
#include "common.h"
#include "netutils.h"
#include "utils.h"
@@ -28,11 +33,6 @@
void print_help (void);
void print_usage (void);
-const char *progname = "check_dig";
-const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
-const char *email = "nagiosplug-devel at lists.sourceforge.net";
-
enum {
UNDEFINED = 0,
DEFAULT_PORT = 53
Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- check_ldap.c 2 Dec 2004 21:23:50 -0000 1.21
+++ check_ldap.c 3 Dec 2004 00:55:27 -0000 1.22
@@ -20,7 +20,7 @@
const char *progname = "check_ldap";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -64,7 +64,9 @@
LDAP *ld;
LDAPMessage *result;
- int status;
+ /* should be int result = STATE_UNKNOWN; */
+
+ int status = STATE_UNKNOW;
long microsec;
double elapsed_time;
Index: check_ups.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ups.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_ups.c 2 Dec 2004 16:51:25 -0000 1.20
+++ check_ups.c 3 Dec 2004 00:55:28 -0000 1.21
@@ -29,7 +29,7 @@
const char *progname = "check_ups";
const char *revision = "$Revision$";
-const char *copyright = "2000-2002";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include <locale.h>
@@ -96,7 +96,7 @@
int
main (int argc, char **argv)
{
- int result = STATE_OK;
+ int result = STATE_UNKNOWN;
char *message;
char *data;
char temp_buffer[MAX_INPUT_BUFFER];
Index: check_nwstat.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nwstat.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_nwstat.c 2 Dec 2004 16:51:25 -0000 1.20
+++ check_nwstat.c 3 Dec 2004 00:55:27 -0000 1.21
@@ -20,7 +20,7 @@
const char *progname = "check_nwstat";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -84,7 +84,7 @@
int
main(int argc, char **argv) {
- int result;
+ int result = STATE_UNKNOWN;
int sd;
char *send_buffer=NULL;
char recv_buffer[MAX_INPUT_BUFFER];
Index: check_pgsql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_pgsql.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- check_pgsql.c 2 Dec 2004 16:51:25 -0000 1.22
+++ check_pgsql.c 3 Dec 2004 00:55:27 -0000 1.23
@@ -18,6 +18,17 @@
*****************************************************************************/
+const char *progname = "check_pgsql";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel at lists.sourceforge.net";
+
+#include "common.h"
+#include "utils.h"
+
+#include "netutils.h"
+#include <libpq-fe.h>
+
#define DEFAULT_DB "template1"
#define DEFAULT_HOST "127.0.0.1"
@@ -27,10 +38,7 @@
DEFAULT_CRIT = 8
};
-#include "common.h"
-#include "utils.h"
-#include "netutils.h"
-#include <libpq-fe.h>
+
int process_arguments (int, char **);
int validate_arguments (void);
@@ -53,11 +61,6 @@
PGconn *conn;
/*PGresult *res;*/
-const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
-const char *email = "nagiosplug-devel at lists.sourceforge.net";
-
/******************************************************************************
Index: check_smtp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_smtp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- check_smtp.c 2 Dec 2004 16:51:25 -0000 1.32
+++ check_smtp.c 3 Dec 2004 00:55:28 -0000 1.33
@@ -20,7 +20,7 @@
const char *progname = "check_smtp";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
Index: check_game.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_game.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- check_game.c 2 Dec 2004 16:51:24 -0000 1.15
+++ check_game.c 3 Dec 2004 00:55:27 -0000 1.16
@@ -19,7 +19,7 @@
const char *progname = "check_game";
const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
+const char *copyright = "2002-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -55,7 +55,7 @@
main (int argc, char **argv)
{
char *command_line;
- int result;
+ int result = STATE_UNKNOWN;
FILE *fp;
char input_buffer[MAX_INPUT_BUFFER];
char *p, *ret[QSTAT_MAX_RETURN_ARGS];
Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_nagios.c 2 Dec 2004 16:51:25 -0000 1.16
+++ check_nagios.c 3 Dec 2004 00:55:27 -0000 1.17
@@ -20,7 +20,7 @@
const char *progname = "check_nagios";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
Index: check_procs.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_procs.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- check_procs.c 2 Dec 2004 21:23:50 -0000 1.34
+++ check_procs.c 3 Dec 2004 00:55:27 -0000 1.35
@@ -20,12 +20,13 @@
const char *progname = "check_procs";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
#include "popen.h"
#include "utils.h"
+
#include <pwd.h>
int process_arguments (int, char **);
Index: negate.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/negate.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- negate.c 2 Dec 2004 16:51:25 -0000 1.19
+++ negate.c 3 Dec 2004 00:55:28 -0000 1.20
@@ -55,7 +55,7 @@
const char *progname = "negate";
const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
+const char *copyright = "2002-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#define DEFAULT_TIMEOUT 9
Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- check_nt.c 2 Dec 2004 16:51:25 -0000 1.29
+++ check_nt.c 3 Dec 2004 00:55:27 -0000 1.30
@@ -30,6 +30,11 @@
*
*****************************************************************************/
+const char *progname = "check_nt";
+const char *revision = "$Revision$";
+const char *copyright = "2003-2004";
+const char *email = "nagiosplug-devel at lists.sourceforge.net";
+
#include "common.h"
#include "netutils.h"
#include "utils.h"
@@ -65,8 +70,6 @@
enum checkvars vars_to_check = CHECK_NONE;
int show_all=FALSE;
-const char *progname = "check_nt";
-
char recv_buffer[MAX_INPUT_BUFFER];
void fetch_data (const char* address, int port, const char* sendb);
@@ -77,6 +80,9 @@
void print_usage(void);
int main(int argc, char **argv){
+
+/* should be int result = STATE_UNKNOWN; */
+
int return_code = STATE_UNKNOWN;
char *send_buffer=NULL;
char *output_message=NULL;
Index: check_load.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_load.c 2 Dec 2004 16:51:24 -0000 1.20
+++ check_load.c 3 Dec 2004 00:55:27 -0000 1.21
@@ -20,7 +20,7 @@
const char *progname = "check_load";
const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
@@ -54,7 +54,8 @@
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
+
#if HAVE_GETLOADAVG==1
double la[3] = { 0.0, 0.0, 0.0 }; /* NetBSD complains about unitialized arrays */
#else
Index: urlize.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/urlize.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- urlize.c 1 Dec 2004 23:54:51 -0000 1.13
+++ urlize.c 3 Dec 2004 00:55:28 -0000 1.14
@@ -20,7 +20,7 @@
const char *progname = "urlize";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
#include "common.h"
More information about the Commits
mailing list