Przeglądaj źródła

bump copyright year
initialize result to STATE_UNKNOW in place of STATE_OK


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@982 f882894a-f735-0410-b71e-b25c423dba1c

Benoit Mortier 21 lat temu
rodzic
commit
016d33230e

+ 1 - 1
plugins/check_by_ssh.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"

+ 5 - 5
plugins/check_dig.c

@@ -18,6 +18,11 @@
  
 *****************************************************************************/
 
+const char *progname = "check_dig";
+const char *revision = "$Revision$";
+const char *copyright = "2002-2003";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -28,11 +33,6 @@ int validate_arguments (void);
 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@lists.sourceforge.net";
-
 enum {
 	UNDEFINED = 0,
 	DEFAULT_PORT = 53

+ 5 - 5
plugins/check_dns.c

@@ -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@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 *);

+ 5 - 5
plugins/check_dummy.c

@@ -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@lists.sourceforge.net";
 
+#include "common.h"
+#include "utils.h"
+
 void print_help (void);
 void print_usage (void);
 
@@ -34,7 +34,7 @@ void print_usage (void);
 int
 main (int argc, char **argv)
 {
-	int result;
+	int result = STATE_UNKNOWN;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);

+ 3 - 1
plugins/check_fping.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -57,6 +57,8 @@ int wrta_p = FALSE;
 int
 main (int argc, char **argv)
 {
+/* normaly should be 	int result = STATE_UNKNOWN; */
+
 	int status = STATE_UNKNOWN;
 	char *server = NULL;
 	char *command_line = NULL;

+ 2 - 2
plugins/check_game.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -55,7 +55,7 @@ int
 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];

+ 7 - 6
plugins/check_hpjd.c

@@ -17,6 +17,11 @@
 * $Id$
 *****************************************************************************/
 
+const char *progname = "check_hpjd";
+const char *revision = "$Revision$";
+const char *copyright = "2000-2004";
+const char *email = "nagiosplug-devel@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@lists.sourceforge.net";
 
 const char *option_summary = "-H host [-C community]\n";
 
@@ -59,7 +60,7 @@ int
 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 @@ main (int argc, char **argv)
 	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 */

+ 6 - 0
plugins/check_ide-smart.c

@@ -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@lists.sourceforge.net";
 	
 #include "common.h"
 #include "utils.h"
+
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>

+ 4 - 2
plugins/check_ldap.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -64,7 +64,9 @@ main (int argc, char *argv[])
 	LDAP *ld;
 	LDAPMessage *result;
 
-	int status;
+	/* should be 	int result = STATE_UNKNOWN; */
+	
+	int status = STATE_UNKNOW;
 	long microsec;
 	double elapsed_time;
 

+ 3 - 2
plugins/check_load.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -54,7 +54,8 @@ char *status_line;
 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

+ 7 - 5
plugins/check_mrtg.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -43,7 +43,7 @@ char *units;
 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 @@ main (int argc, char **argv)
 
 	return result;
 }
-
+
+
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -210,7 +212,7 @@ process_arguments (int argc, char **argv)
 		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 @@ int
 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");

+ 2 - 2
plugins/check_mrtgtraf.c

@@ -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@lists.sourceforge.net";
 
 int process_arguments (int, char **);
@@ -43,7 +43,7 @@ unsigned long outgoing_critical_threshold = 0L;
 int
 main (int argc, char **argv)
 {
-	int result = STATE_OK;
+	int result = STATE_UNKNOWN;
 	FILE *fp;
 	int line;
 	char input_buffer[MAX_INPUT_BUFFER];

+ 5 - 1
plugins/check_mysql.c

@@ -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@lists.sourceforge.net";
 
 #define SLAVERESULTSIZE 40
@@ -24,6 +24,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "common.h"
 #include "utils.h"
 #include "netutils.h"
+
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
 
@@ -48,6 +49,9 @@ main (int argc, char **argv)
 	MYSQL mysql;
 	MYSQL_RES *res;
 	MYSQL_ROW row;
+	
+	/* should be status */
+	
 	char *result = NULL;
 	char slaveresult[SLAVERESULTSIZE];
 

+ 1 - 1
plugins/check_nagios.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"

+ 8 - 2
plugins/check_nt.c

@@ -30,6 +30,11 @@
  *
  *****************************************************************************/
 
+const char *progname = "check_nt";
+const char *revision = "$Revision$";
+const char *copyright = "2003-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -65,8 +70,6 @@ int check_critical_value=FALSE;
 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_help(void);
 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;

+ 2 - 2
plugins/check_nwstat.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -84,7 +84,7 @@ void print_usage(void);
 
 int
 main(int argc, char **argv) {
-	int result;
+	int result = STATE_UNKNOWN;
 	int sd;
 	char *send_buffer=NULL;
 	char recv_buffer[MAX_INPUT_BUFFER];

+ 2 - 2
plugins/check_overcr.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -63,7 +63,7 @@ void print_help (void);
 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;

+ 12 - 9
plugins/check_pgsql.c

@@ -18,6 +18,17 @@
  
  *****************************************************************************/
 
+const char *progname = "check_pgsql";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@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 @@ enum {
 	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 @@ double tcrit = (double)DEFAULT_CRIT;
 PGconn *conn;
 /*PGresult   *res;*/
 
-const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
-
 
 /******************************************************************************
 

+ 1 - 1
plugins/check_ping.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"

+ 2 - 1
plugins/check_procs.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
 #include "popen.h"
 #include "utils.h"
+
 #include <pwd.h>
 
 int process_arguments (int, char **);

+ 1 - 1
plugins/check_radius.c

@@ -104,7 +104,7 @@ main (int argc, char **argv)
 	UINT4 service;
 	char msg[BUFFER_LEN];
 	SEND_DATA data;
-	int result;
+	int result = STATE_UNKNOWN;
 	UINT4 client_id;
 	char *str;
 

+ 2 - 2
plugins/check_real.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -56,7 +56,7 @@ int
 main (int argc, char **argv)
 {
 	int sd;
-	int result;
+	int result = STATE_UNKNOWN;
 	char buffer[MAX_INPUT_BUFFER];
 	char *status_line = NULL;
 

+ 1 - 1
plugins/check_smtp.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"

+ 1 - 1
plugins/check_snmp.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"

+ 7 - 6
plugins/check_ssh.c

@@ -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@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 ssh_connect (char *haddr, int hport, char *remote_version);
 int
 main (int argc, char **argv)
 {
-	int result;
+	int result = STATE_UNKNOWN;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
@@ -62,6 +62,7 @@ main (int argc, char **argv)
 
 	/* initialize alarm signal handling */
 	signal (SIGALRM, socket_timeout_alarm_handler);
+	
 	alarm (socket_timeout);
 
 	/* ssh_connect exits if error is found */

+ 6 - 6
plugins/check_swap.c

@@ -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@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 @@ main (int argc, char **argv)
 	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;

+ 2 - 2
plugins/check_tcp.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -105,7 +105,7 @@ char *buffer;
 int
 main (int argc, char **argv)
 {
-	int result;
+	int result = STATE_UNKNOWN;
 	int i;
 	char *status;
 	struct timeval tv;

+ 6 - 6
plugins/check_time.c

@@ -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@lists.sourceforge.net";
 
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
 enum {
 	TIME_PORT = 37
 };
@@ -55,7 +55,7 @@ int
 main (int argc, char **argv)
 {
 	int sd;
-	int result;
+	int result = STATE_UNKNOWN;
 	time_t conntime;
 
 	setlocale (LC_ALL, "");

+ 3 - 2
plugins/check_udp.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -44,7 +44,7 @@ char *server_send;
 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 @@ main (int argc, char **argv)
 	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) {

+ 2 - 2
plugins/check_ups.c

@@ -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@lists.sourceforge.net";
 
 #include <locale.h>
@@ -96,7 +96,7 @@ void print_usage (void);
 int
 main (int argc, char **argv)
 {
-	int result = STATE_OK;
+	int result = STATE_UNKNOWN;
 	char *message;
 	char *data;
 	char temp_buffer[MAX_INPUT_BUFFER];

+ 2 - 2
plugins/check_users.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"
@@ -40,7 +40,7 @@ int
 main (int argc, char **argv)
 {
 	int users = -1;
-	int result = STATE_OK;
+	int result = STATE_UNKNOWN;
 	char input_buffer[MAX_INPUT_BUFFER];
 	char *perf;
 

+ 1 - 1
plugins/negate.c

@@ -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@lists.sourceforge.net";
 
 #define DEFAULT_TIMEOUT 9

+ 1 - 1
plugins/urlize.c

@@ -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@lists.sourceforge.net";
 
 #include "common.h"