Code

Miscelleneous bug fixes (Gerd Mueller - 1235879)
[nagiosplug.git] / plugins / check_nwstat.c
index 4b2272699e3e2b26c3266106efc8801b8dc51520..9f17a7dd78f991302140ca4211c1c8ed9f2a328e 100644 (file)
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
 ******************************************************************************/
 
 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"
@@ -80,12 +82,10 @@ void print_usage(void);
 
 
 
-
-
-\f
 int
 main(int argc, char **argv) {
-       int result;
+       int result = STATE_UNKNOWN;
+       int sd;
        char *send_buffer=NULL;
        char recv_buffer[MAX_INPUT_BUFFER];
        char *output_message=NULL;
@@ -117,29 +117,36 @@ main(int argc, char **argv) {
        unsigned long sap_entries=0;
        char uptime[MAX_INPUT_BUFFER];
 
-       if (process_arguments(argc,argv)==ERROR)
-               usage(_("Could not parse arguments\n"));
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
+       if (process_arguments(argc,argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal(SIGALRM,socket_timeout_alarm_handler);
 
        /* set socket timeout */
        alarm(socket_timeout);
-       
+
+       /* open connection */
+       my_tcp_connect (server_address, server_port, &sd);
+
        /* get OS version string */
        if (check_netware_version==TRUE) {
                send_buffer = strdup ("S19\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                if (!strcmp(recv_buffer,"-1\n"))
-                       asprintf (&netware_version, "%s", "");
+                       netware_version = strdup("");
                else {
                        recv_buffer[strlen(recv_buffer)-1]=0;
                        asprintf (&netware_version,_("NetWare %s: "),recv_buffer);
                }
        } else
-               asprintf (&netware_version, "%s", "");
+               netware_version = strdup("");
 
 
        /* check CPU load */
@@ -158,12 +165,16 @@ main(int argc, char **argv) {
                }
 
                asprintf (&send_buffer,"UTIL%s\r\n",temp_buffer);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                utilization=strtoul(recv_buffer,NULL,10);
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("UPTIME\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                recv_buffer[strlen(recv_buffer)-1]=0;
@@ -185,7 +196,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==CONNS) {
 
                send_buffer = strdup ("CONNECT\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                current_connections=strtoul(recv_buffer,NULL,10);
@@ -204,7 +215,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==LTCH) {
 
                send_buffer = strdup ("S1\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                cache_hits=atoi(recv_buffer);
@@ -223,7 +234,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==CBUFF) {
 
                send_buffer = strdup ("S2\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                cache_buffers=strtoul(recv_buffer,NULL,10);
@@ -242,7 +253,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==CDBUFF) {
 
                send_buffer = strdup ("S3\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                cache_buffers=strtoul(recv_buffer,NULL,10);
@@ -261,7 +272,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==LRUM) {
 
                send_buffer = strdup ("S5\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                lru_time=strtoul(recv_buffer,NULL,10);
@@ -281,12 +292,12 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VKF) {
 
                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
                }       else {
                        free_disk_space=strtoul(recv_buffer,NULL,10);
@@ -305,40 +316,44 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VPF) {
 
                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
 
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
 
                } else {
 
                        free_disk_space=strtoul(recv_buffer,NULL,10);
 
+                       close(sd);
+                       my_tcp_connect (server_address, server_port, &sd);
+
                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                       result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                       result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                        if (result!=STATE_OK)
                                return result;
                        total_disk_space=strtoul(recv_buffer,NULL,10);
 
-                       percent_free_space=(int)(((double)free_disk_space/(double)total_disk_space)*100.0);
+                       percent_free_space=(unsigned long)(((double)free_disk_space/(double)total_disk_space)*100.0);
 
                        if (check_critical_value==TRUE && percent_free_space <= critical_value)
                                result=STATE_CRITICAL;
                        else if (check_warning_value==TRUE && percent_free_space <= warning_value)
                                result=STATE_WARNING;
                        free_disk_space/=1024;
-                       asprintf (&output_message,_("%lu MB (%lu%%) free on volume %s"),free_disk_space,percent_free_space,volume_name);
+                       total_disk_space/=1024;
+                       asprintf (&output_message,_("%lu MB (%lu%%) free on volume %s - total %lu MB"),free_disk_space,percent_free_space,volume_name,total_disk_space);
                }
 
                /* check to see if DS Database is open or closed */
        } else if (vars_to_check==DSDB) {
 
                send_buffer = strdup ("S11\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                if (atoi(recv_buffer)==1)
@@ -346,8 +361,11 @@ main(int argc, char **argv) {
                else
                        result=STATE_WARNING;
  
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S13\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                temp_buffer=strtok(recv_buffer,"\r\n");
  
                asprintf (&output_message,_("Directory Services Database is %s (DS version %s)"),(result==STATE_OK)?"open":"closed",temp_buffer);
@@ -356,7 +374,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==LOGINS) {
 
                send_buffer = strdup ("S12\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                if (atoi(recv_buffer)==1)
@@ -370,14 +388,14 @@ main(int argc, char **argv) {
        } else if (vars_to_check==UPRB || vars_to_check==PUPRB) {
  
                asprintf (&send_buffer,"S15\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                used_packet_receive_buffers=atoi(recv_buffer);
 
                asprintf (&send_buffer,"S16\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
@@ -406,7 +424,7 @@ main(int argc, char **argv) {
                        asprintf (&send_buffer,"S9\r\n");
                else
                        asprintf (&send_buffer,"S9.%d\r\n",sap_number);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
  
@@ -426,12 +444,12 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VKP) {
 
                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
                } else {
                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -446,13 +464,13 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VPP) {
 
                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
 
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
 
                } else {
@@ -460,12 +478,12 @@ main(int argc, char **argv) {
                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
 
                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                       result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                       result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                        if (result!=STATE_OK)
                                return result;
                        total_disk_space=strtoul(recv_buffer,NULL,10);
 
-                       percent_purgeable_space=(int)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
+                       percent_purgeable_space=(unsigned long)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
 
                        if (check_critical_value==TRUE && percent_purgeable_space >= critical_value)
                                result=STATE_CRITICAL;
@@ -479,12 +497,12 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VKNP) {
 
                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
                } else {
                        non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -499,13 +517,13 @@ main(int argc, char **argv) {
        } else if (vars_to_check==VPNP) {
 
                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                if (!strcmp(recv_buffer,"-1\n")) {
 
-                       asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+                       asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
 
                } else {
@@ -513,12 +531,12 @@ main(int argc, char **argv) {
                        non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
 
                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                       result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+                       result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                        if (result!=STATE_OK)
                                return result;
                        total_disk_space=strtoul(recv_buffer,NULL,10);
 
-                       percent_non_purgeable_space=(int)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
+                       percent_non_purgeable_space=(unsigned long)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
 
                        if (check_critical_value==TRUE && percent_non_purgeable_space >= critical_value)
                                result=STATE_CRITICAL;
@@ -532,7 +550,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==OFILES) {
 
                asprintf (&send_buffer,"S18\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
  
@@ -549,7 +567,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==ABENDS) {
 
                asprintf (&send_buffer,"S17\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
  
@@ -566,14 +584,17 @@ main(int argc, char **argv) {
        } else if (vars_to_check==CSPROCS) {
 
                asprintf (&send_buffer,"S20\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
  
                max_service_processes=atoi(recv_buffer);
  
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S21\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
  
@@ -593,7 +614,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==TSYNC) {
 
                asprintf (&send_buffer,"S22\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
@@ -601,17 +622,17 @@ main(int argc, char **argv) {
 
                if (time_sync_status==0) {
                        result=STATE_CRITICAL;
-                       asprintf (&output_message,_("Critical: Time not in sync with network!"));
+                       asprintf (&output_message,_("CRITICAL - Time not in sync with network!"));
                }
                else {
-                       asprintf (&output_message,_("OK! Time in sync with network!"));
+                       asprintf (&output_message,_("OK - Time in sync with network!"));
                }
 
                /* check LRU sitting time in secondss */
        } else if (vars_to_check==LRUS) {
 
                send_buffer = strdup ("S4\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                lru_time=strtoul(recv_buffer,NULL,10);
@@ -627,7 +648,7 @@ main(int argc, char **argv) {
        } else if (vars_to_check==DCB) {
 
                send_buffer = strdup ("S6\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                dirty_cache_buffers=atoi(recv_buffer);
@@ -636,13 +657,13 @@ main(int argc, char **argv) {
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value)
                        result=STATE_WARNING;
-               asprintf (&output_message,_("dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
+               asprintf (&output_message,_("Dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
 
                /* check % total cache buffers as a percentage of the original*/
        } else if (vars_to_check==TCB) {
 
                send_buffer = strdup ("S7\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
                total_cache_buffers=atoi(recv_buffer);
@@ -651,11 +672,11 @@ main(int argc, char **argv) {
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && total_cache_buffers <= warning_value)
                        result=STATE_WARNING;
-               asprintf (&output_message,_("total cache buffers = %lu%% of the original"),total_cache_buffers);
+               asprintf (&output_message,_("Total cache buffers = %lu%% of the original"),total_cache_buffers);
                
        } else if (vars_to_check==DSVER) {
                asprintf (&send_buffer,"S13\r\n");
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
@@ -664,17 +685,20 @@ main(int argc, char **argv) {
                asprintf (&output_message,_("NDS Version %s"),recv_buffer);
 
        } else if (vars_to_check==UPTIME) {
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               asprintf (&send_buffer,"UPTIME\r\n");
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
-               recv_buffer[strlen(recv_buffer)-1]=0;
 
+               recv_buffer[sizeof(recv_buffer)-1]=0;
+               recv_buffer[strlen(recv_buffer)-1]=0;
+       
                asprintf (&output_message,_("Up %s"),recv_buffer);
 
        } else if (vars_to_check==NLM) {
                asprintf (&send_buffer,"S24:%s\r\n",nlm_name);
-               result=process_tcp_request(server_address,server_port,send_buffer,recv_buffer,sizeof(recv_buffer));
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
@@ -693,6 +717,8 @@ main(int argc, char **argv) {
 
        }
 
+       close (sd);
+
        /* reset timeout */
        alarm(0);
 
@@ -700,13 +726,15 @@ main(int argc, char **argv) {
 
        return result;
 }
-\f
+
+
+
 /* process command-line arguments */
 int process_arguments(int argc, char **argv) {
        int c;
 
-       int option_index = 0;
-       static struct option long_options[] =
+       int option = 0;
+       static struct option longopts[] =
                { 
                        {"port",     required_argument,0,'p'},
                        {"timeout",  required_argument,0,'t'},
@@ -741,7 +769,7 @@ int process_arguments(int argc, char **argv) {
        }
 
        while (1) {
-               c = getopt_long(argc,argv,"+hoVH:t:c:w:p:v:",long_options,&option_index);
+               c = getopt_long(argc,argv,"+hoVH:t:c:w:p:v:",longopts,&option);
 
                if (c==-1||c==EOF||c==1)
                        break;
@@ -749,9 +777,7 @@ int process_arguments(int argc, char **argv) {
                switch (c)
                        {
                        case '?': /* print short usage statement if args not parsable */
-                               printf ("%s: Unknown argument: %s\n\n", progname, optarg);
-                               print_usage();
-                               exit(STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                        case 'h': /* help */
                                print_help();
                                exit(STATE_OK);
@@ -768,7 +794,7 @@ int process_arguments(int argc, char **argv) {
                                if (is_intnonneg(optarg))
                                        server_port=atoi(optarg);
                                else
-                                       die(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
+                                       die(STATE_UNKNOWN,_("Server port an integer\n"));
                                break;
                        case 'v':
                                if (strlen(optarg)<3)
@@ -856,8 +882,9 @@ int process_arguments(int argc, char **argv) {
                                        vars_to_check=TSYNC;
                                else if (!strcmp(optarg,"DSVER"))
                                        vars_to_check=DSVER;
-                               else if (!strcmp(optarg,"UPTIME"))
+                               else if (!strcmp(optarg,"UPTIME")) {
                                        vars_to_check=UPTIME;
+                               }
                                else if (strncmp(optarg,"NLM:",4)==0) {
                                        vars_to_check=NLM;
                                        nlm_name=strdup (optarg+4);
@@ -886,9 +913,6 @@ int process_arguments(int argc, char **argv) {
 
 
 
-
-
-\f
 void print_help(void)
 {
        char *myport;
@@ -896,13 +920,12 @@ void print_help(void)
 
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("\
-Usage: %s This plugin attempts to contact the MRTGEXT NLM running\n\
-on a Novell server to gather the requested system information.\n\n"),
-               progname);
+This plugin attempts to contact the MRTGEXT NLM running on a\n\
+Novell server to gather the requested system information.\n\n"));
 
        print_usage();
 
@@ -977,11 +1000,9 @@ Notes:\n\
 
 
 
-
 void print_usage(void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
-  [-t timeout].\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+                    [-t timeout].\n", progname);
 }