Code

Fix translations when extra-opts aren't enabled
[nagiosplug.git] / plugins / check_nwstat.c
index 46bc7e90816bba4729866034b8b71b228782889d..2c3369a5fe941606790086466bba794edf70c40a 100644 (file)
@@ -1,24 +1,36 @@
-/******************************************************************************
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-******************************************************************************/
+/*****************************************************************************
+* 
+* Nagios check_nwstat plugin
+* 
+* License: GPL
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* 
+* Description:
+* 
+* This file contains the check_nwstat plugin
+* 
+* This plugin attempts to contact the MRTGEXT NLM running on a
+* Novell server to gather the requested system information.
+* 
+* 
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* 
+*****************************************************************************/
 
 const char *progname = "check_nwstat";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -32,6 +44,9 @@ enum checkvar {
        LOAD15,     /* check 15 minute CPU load */
        CONNS,      /* check number of connections */
        VPF,        /* check % free space on volume */
+       VMF,        /* check MB free space on volume */
+       VMU,        /* check MB used space on volume */
+       VMP,        /* check MB purgeable space on volume */
        VKF,        /* check KB free space on volume */
        LTCH,       /* check long-term cache hit percentage */
        CBUFF,      /* check total cache buffers */
@@ -39,6 +54,7 @@ enum checkvar {
        LRUM,       /* check LRU sitting time in minutes */
        DSDB,       /* check to see if DS Database is open */
        LOGINS,     /* check to see if logins are enabled */
+       NRMH,       /* check to see NRM Health Status */
        PUPRB,      /* check % of used packet receive buffers */
        UPRB,       /* check used packet receive buffers */
        SAPENTRIES, /* check SAP entries */
@@ -55,7 +71,17 @@ enum checkvar {
        TCB,        /* check total cache buffers as a percentage of the original */
        DSVER,      /* check NDS version */
        UPTIME,     /* check server uptime */
-       NLM         /* check NLM loaded */
+       NLM,        /* check NLM loaded */
+       NRMP,       /* check NRM Process Values */
+       NRMM,       /* check NRM Memory Values */
+       NRMS,       /* check NRM Values */
+       NSS1,       /* check Statistics from _Admin:Manage_NSS\GeneralStats.xml */
+       NSS2,       /* check Statistics from _Admin:Manage_NSS\BufferCache.xml */
+       NSS3,       /* check statistics from _Admin:Manage_NSS\NameCache.xml */
+       NSS4,       /* check statistics from _Admin:Manage_NSS\FileStats.xml */
+       NSS5,       /* check statistics from _Admin:Manage_NSS\ObjectCache.xml */
+       NSS6,       /* check statistics from _Admin:Manage_NSS\Thread.xml */
+       NSS7        /* check statistics from _Admin:Manage_NSS\AuthorizationCache.xml */
 };
 
 enum {
@@ -65,6 +91,16 @@ enum {
 char *server_address=NULL;
 char *volume_name=NULL;
 char *nlm_name=NULL;
+char *nrmp_name=NULL;
+char *nrmm_name=NULL;
+char *nrms_name=NULL;
+char *nss1_name=NULL;
+char *nss2_name=NULL;
+char *nss3_name=NULL;
+char *nss4_name=NULL;
+char *nss5_name=NULL;
+char *nss6_name=NULL;
+char *nss7_name=NULL;
 int server_port=PORT;
 unsigned long warning_value=0L;
 unsigned long critical_value=0L;
@@ -80,12 +116,9 @@ 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];
@@ -94,6 +127,7 @@ main(int argc, char **argv) {
        char *netware_version=NULL;
 
        int time_sync_status=0;
+       int nrm_health_status=0;
        unsigned long total_cache_buffers=0;
        unsigned long dirty_cache_buffers=0;
        unsigned long open_files=0;
@@ -101,6 +135,16 @@ main(int argc, char **argv) {
        unsigned long max_service_processes=0;
        unsigned long current_service_processes=0;
        unsigned long free_disk_space=0L;
+       unsigned long nrmp_value=0L;
+       unsigned long nrmm_value=0L;
+       unsigned long nrms_value=0L;
+       unsigned long nss1_value=0L;
+       unsigned long nss2_value=0L;
+       unsigned long nss3_value=0L;
+       unsigned long nss4_value=0L;
+       unsigned long nss5_value=0L;
+       unsigned long nss6_value=0L;
+       unsigned long nss7_value=0L;
        unsigned long total_disk_space=0L;
        unsigned long purgeable_disk_space=0L;
        unsigned long non_purgeable_disk_space=0L;
@@ -122,8 +166,11 @@ main(int argc, char **argv) {
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments(argc,argv)==ERROR)
-               usage(_("Could not parse arguments\n"));
+       /* Parse extra opts if any */
+       argv=np_extra_opts(&argc, argv, progname);
+
+       if (process_arguments(argc,argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal(SIGALRM,socket_timeout_alarm_handler);
@@ -152,7 +199,7 @@ main(int argc, char **argv) {
 
        /* check CPU load */
        if (vars_to_check==LOAD1 || vars_to_check==LOAD5 || vars_to_check==LOAD15) {
-                       
+
                switch(vars_to_check) {
                case LOAD1:
                        temp_buffer = strdup ("1");
@@ -165,11 +212,18 @@ main(int argc, char **argv) {
                        break;
                }
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"UTIL%s\r\n",temp_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=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -183,15 +237,22 @@ main(int argc, char **argv) {
                        result=STATE_WARNING;
 
                asprintf (&output_message,
-                         _("Load %s - %s %s-min load average = %lu%%"),
+                         _("Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"),
                          state_text(result),
                          uptime,
                          temp_buffer,
-                         utilization);
+                         utilization,
+                         temp_buffer,
+                         utilization,
+                         warning_value,
+                         critical_value);
 
                /* check number of user connections */
        } else if (vars_to_check==CONNS) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("CONNECT\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -204,13 +265,19 @@ main(int argc, char **argv) {
                        result=STATE_WARNING;
 
                asprintf (&output_message,
-                                                       _("Conns %s - %lu current connections"),
+                       _("Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"),
                          state_text(result),
-                         current_connections);
+                         current_connections,
+                         current_connections,
+                         warning_value,
+                         critical_value);
 
                /* check % long term cache hits */
        } else if (vars_to_check==LTCH) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S1\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -230,6 +297,9 @@ main(int argc, char **argv) {
                /* check cache buffers */
        } else if (vars_to_check==CBUFF) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S2\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -242,13 +312,19 @@ main(int argc, char **argv) {
                        result=STATE_WARNING;
 
                asprintf (&output_message,
-                         _("%s: Total cache buffers = %lu"),
+                         _("%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"),
                          state_text(result),
-                         cache_buffers);
+                         cache_buffers,
+                         cache_buffers,
+                         warning_value,
+                         critical_value);
 
                /* check dirty cache buffers */
        } else if (vars_to_check==CDBUFF) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S3\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -261,13 +337,19 @@ main(int argc, char **argv) {
                        result=STATE_WARNING;
 
                asprintf (&output_message,
-                         _("%s: Dirty cache buffers = %lu"),
+                         _("%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"),
                          state_text(result),
-                         cache_buffers);
+                         cache_buffers,
+                         cache_buffers,
+                         warning_value,
+                         critical_value);
 
                /* check LRU sitting time in minutes */
        } else if (vars_to_check==LRUM) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S5\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -288,13 +370,71 @@ main(int argc, char **argv) {
                /* check KB free space on volume */
        } else if (vars_to_check==VKF) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
                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);
+                       if (check_critical_value==TRUE && free_disk_space <= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && free_disk_space <= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"),
+                                (result==STATE_OK)?"":_("Only "),
+                                free_disk_space,
+                                volume_name,
+                                volume_name,
+                                free_disk_space,
+                                warning_value,
+                                critical_value);
+               }
+
+               /* check MB free space on volume */
+       } else if (vars_to_check==VMF) {
+
+               asprintf (&send_buffer,"VMF%s\r\n",volume_name);
+               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,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       free_disk_space=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && free_disk_space <= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && free_disk_space <= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"),
+                                (result==STATE_OK)?"":_("Only "),
+                                free_disk_space,
+                                volume_name,
+                                volume_name,
+                                free_disk_space,
+                                warning_value,
+                                critical_value);
+               }
+               /* check MB used space on volume */
+       } else if (vars_to_check==VMU) {
+
+               asprintf (&send_buffer,"VMU%s\r\n",volume_name);
+               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,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
                }       else {
                        free_disk_space=strtoul(recv_buffer,NULL,10);
@@ -303,15 +443,23 @@ main(int argc, char **argv) {
                        else if (check_warning_value==TRUE && free_disk_space <= warning_value)
                                result=STATE_WARNING;
                        asprintf (&output_message,
-                                 _("%s%lu KB free on volume %s"),
+                                 _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"),
                                 (result==STATE_OK)?"":_("Only "),
                                 free_disk_space,
-                                volume_name);
+                                volume_name,
+                                volume_name,
+                                free_disk_space,
+                                warning_value,
+                                critical_value);
                }
 
+
                /* check % free space on volume */
        } else if (vars_to_check==VPF) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKF%s\r\n",volume_name);
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -319,32 +467,48 @@ main(int argc, char **argv) {
 
                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=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|FreeMB%s=%lu;%lu;%lu;0;100"),
+                               free_disk_space,
+                               percent_free_space,
+                               volume_name,
+                               total_disk_space,
+                               volume_name,
+                                percent_free_space,
+                                warning_value,
+                                critical_value
+                                );
                }
 
                /* check to see if DS Database is open or closed */
        } else if (vars_to_check==DSDB) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S11\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -353,16 +517,22 @@ main(int argc, char **argv) {
                        result=STATE_OK;
                else
                        result=STATE_WARNING;
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S13\r\n");
                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);
 
                /* check to see if logins are enabled */
        } else if (vars_to_check==LOGINS) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S12\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -371,12 +541,41 @@ main(int argc, char **argv) {
                        result=STATE_OK;
                else
                        result=STATE_WARNING;
+
                asprintf (&output_message,_("Logins are %s"),(result==STATE_OK)?_("enabled"):_("disabled"));
 
+
+               /* check NRM Health Status Summary*/
+       } else if (vars_to_check==NRMH) {
+
+               asprintf (&send_buffer,"NRMH\r\n");
+               result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+               if (result!=STATE_OK)
+                       return result;
+
+               nrm_health_status=atoi(recv_buffer);
+
+               if (nrm_health_status==2) {
+                       result=STATE_OK;
+                       asprintf (&output_message,_("CRITICAL - NRM Status is bad!"));
+               }
+               else {
+                       if (nrm_health_status==1) {
+                               result=STATE_WARNING;
+                               asprintf (&output_message,_("Warning - NRM Status is suspect!"));
+                       }
+
+                       asprintf (&output_message,_("OK - NRM Status is good!"));
+               }
+
+
+
                /* check packet receive buffers */
        } else if (vars_to_check==UPRB || vars_to_check==PUPRB) {
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S15\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -384,13 +583,16 @@ main(int argc, char **argv) {
 
                used_packet_receive_buffers=atoi(recv_buffer);
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S16\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
 
                max_packet_receive_buffers=atoi(recv_buffer);
+
                percent_used_packet_receive_buffers=(unsigned long)(((double)used_packet_receive_buffers/(double)max_packet_receive_buffers)*100.0);
 
                if (vars_to_check==UPRB) {
@@ -404,12 +606,15 @@ main(int argc, char **argv) {
                        else if (check_warning_value==TRUE && percent_used_packet_receive_buffers >= warning_value)
                                result=STATE_WARNING;
                }
+
                asprintf (&output_message,_("%lu of %lu (%lu%%) packet receive buffers used"),used_packet_receive_buffers,max_packet_receive_buffers,percent_used_packet_receive_buffers);
 
                /* check SAP table entries */
        } else if (vars_to_check==SAPENTRIES) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                if (sap_number==-1)
                        asprintf (&send_buffer,"S9\r\n");
                else
@@ -417,9 +622,9 @@ main(int argc, char **argv) {
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
+
                sap_entries=atoi(recv_buffer);
+
                if (check_critical_value==TRUE && sap_entries >= critical_value)
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && sap_entries >= warning_value)
@@ -433,13 +638,42 @@ main(int argc, char **argv) {
                /* check KB purgeable space on volume */
        } else if (vars_to_check==VKP) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
                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);
+                       if (check_critical_value==TRUE && purgeable_disk_space >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,_("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
+                                (result==STATE_OK)?"":_("Only "),
+                                purgeable_disk_space,
+                                volume_name,
+                                volume_name,
+                                purgeable_disk_space,
+                                warning_value,
+                                critical_value);
+               }
+               /* check MB purgeable space on volume */
+       } else if (vars_to_check==VMP) {
+
+               asprintf (&send_buffer,"VMP%s\r\n",volume_name);
+               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,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
                        result=STATE_CRITICAL;
                } else {
                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -447,12 +681,22 @@ main(int argc, char **argv) {
                                result=STATE_CRITICAL;
                        else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value)
                                result=STATE_WARNING;
-                       asprintf (&output_message,_("%s%lu KB purgeable on volume %s"),(result==STATE_OK)?"":_("Only "),purgeable_disk_space,volume_name);
+                       asprintf (&output_message,_("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
+                                (result==STATE_OK)?"":_("Only "),
+                                purgeable_disk_space,
+                                volume_name,
+                                volume_name,
+                                purgeable_disk_space,
+                                warning_value,
+                                critical_value);
                }
 
                /* check % purgeable space on volume */
        } else if (vars_to_check==VPP) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKP%s\r\n",volume_name);
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -460,39 +704,53 @@ main(int argc, char **argv) {
 
                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);
 
+                       close(sd);
+                       my_tcp_connect (server_address, server_port, &sd);
+
                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
                        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;
                        else if (check_warning_value==TRUE && percent_purgeable_space >= warning_value)
                                result=STATE_WARNING;
                        purgeable_disk_space/=1024;
-                       asprintf (&output_message,_("%lu MB (%lu%%) purgeable on volume %s"),purgeable_disk_space,percent_purgeable_space,volume_name);
+                       asprintf (&output_message,_("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"),
+                                       purgeable_disk_space,
+                                       percent_purgeable_space,
+                                       volume_name,
+                                       volume_name,
+                                       percent_purgeable_space,
+                                       warning_value,
+                                       critical_value
+                                       );
                }
 
                /* check KB not yet purgeable space on volume */
        } else if (vars_to_check==VKNP) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
                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);
@@ -506,6 +764,9 @@ main(int argc, char **argv) {
                /* check % not yet purgeable space on volume */
        } else if (vars_to_check==VPNP) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"VKNP%s\r\n",volume_name);
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -513,20 +774,23 @@ main(int argc, char **argv) {
 
                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);
 
+                       close(sd);
+                       my_tcp_connect (server_address, server_port, &sd);
+
                        asprintf (&send_buffer,"VKS%s\r\n",volume_name);
                        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;
@@ -539,67 +803,95 @@ main(int argc, char **argv) {
                /* check # of open files */
        } else if (vars_to_check==OFILES) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S18\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
+
                open_files=atoi(recv_buffer);
+
                if (check_critical_value==TRUE && open_files >= critical_value)
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && open_files >= warning_value)
                        result=STATE_WARNING;
 
-               asprintf (&output_message,_("%lu open files"),open_files);
+               asprintf (&output_message,_("%lu open files|Openfiles=%lu;%lu;%lu;0,0"),
+                               open_files,
+                               open_files,
+                               warning_value,
+                               critical_value);
+
 
-               /* check # of abended threads (Netware 5.x only) */
+               /* check # of abended threads (Netware 5.x only) */
        } else if (vars_to_check==ABENDS) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S17\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
+
                abended_threads=atoi(recv_buffer);
+
                if (check_critical_value==TRUE && abended_threads >= critical_value)
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && abended_threads >= warning_value)
                        result=STATE_WARNING;
 
-               asprintf (&output_message,_("%lu abended threads"),abended_threads);
+               asprintf (&output_message,_("%lu abended threads|Abends=%lu;%lu;%lu;;"),
+                               abended_threads,
+                               abended_threads,
+                               warning_value,
+                               critical_value);
 
                /* check # of current service processes (Netware 5.x only) */
        } else if (vars_to_check==CSPROCS) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S20\r\n");
                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=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
                        return result;
+
                current_service_processes=atoi(recv_buffer);
+
                if (check_critical_value==TRUE && current_service_processes >= critical_value)
                        result=STATE_CRITICAL;
                else if (check_warning_value==TRUE && current_service_processes >= warning_value)
                        result=STATE_WARNING;
 
                asprintf (&output_message,
-                         _("%lu current service processes (%lu max)"),
+                         _("%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"),
                          current_service_processes,
-                         max_service_processes);
+                         max_service_processes,
+                         current_service_processes,
+                         warning_value,
+                         critical_value,
+                         max_service_processes);
 
                /* check # Timesync Status */
        } else if (vars_to_check==TSYNC) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S22\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -609,15 +901,22 @@ 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) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S4\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -634,6 +933,9 @@ main(int argc, char **argv) {
                /* check % dirty cacheobuffers as a percentage of the total*/
        } else if (vars_to_check==DCB) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S6\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -644,11 +946,18 @@ 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|DCB=%lu;%lu;%lu;0;100"),
+                               dirty_cache_buffers,
+                               dirty_cache_buffers,
+                               warning_value,
+                               critical_value);
 
                /* check % total cache buffers as a percentage of the original*/
        } else if (vars_to_check==TCB) {
 
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                send_buffer = strdup ("S7\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -659,9 +968,17 @@ 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|TCB=%lu;%lu;%lu;0;100"),
+                               total_cache_buffers,
+                               total_cache_buffers,
+                               warning_value,
+                               critical_value);
+
        } else if (vars_to_check==DSVER) {
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S13\r\n");
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -672,15 +989,26 @@ main(int argc, char **argv) {
                asprintf (&output_message,_("NDS Version %s"),recv_buffer);
 
        } else if (vars_to_check==UPTIME) {
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
+               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[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) {
+
+               close(sd);
+               my_tcp_connect (server_address, server_port, &sd);
+
                asprintf (&send_buffer,"S24:%s\r\n",nlm_name);
                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                if (result!=STATE_OK)
@@ -692,9 +1020,271 @@ main(int argc, char **argv) {
                } else {
                        result=STATE_CRITICAL;
                        asprintf (&output_message,_("Module %s is not loaded"),nlm_name);
+
+                       }
+       } else if (vars_to_check==NRMP) {
+
+               asprintf (&send_buffer,"NRMP:%s\r\n",nrmp_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nrmp_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nrmp_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nrmp_value <= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nrmp_value <= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nrmp_name,
+                                nrmp_value,
+                                nrmp_name,
+                                nrmp_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NRMM) {
+
+               asprintf (&send_buffer,"NRMM:%s\r\n",nrmm_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nrmm_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nrmm_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nrmm_value <= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nrmm_value <= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nrmm_name,
+                                nrmm_value,
+                                nrmm_name,
+                                nrmm_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NRMS) {
+
+               asprintf (&send_buffer,"NRMS:%s\r\n",nrms_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nrms_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nrms_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nrms_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nrms_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nrms_name,
+                                nrms_value,
+                                nrms_name,
+                                nrms_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS1) {
+
+               asprintf (&send_buffer,"NSS1:%s\r\n",nss1_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss1_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss1_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss1_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss1_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss1_name,
+                                nss1_value,
+                                nss1_name,
+                                nss1_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS2) {
+
+               asprintf (&send_buffer,"NSS2:%s\r\n",nss2_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss2_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss2_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss2_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss2_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss2_name,
+                                nss2_value,
+                                nss2_name,
+                                nss2_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS3) {
+
+               asprintf (&send_buffer,"NSS3:%s\r\n",nss3_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss3_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss3_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss3_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss3_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss3_name,
+                                nss3_value,
+                                nss3_name,
+                                nss3_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS4) {
+
+               asprintf (&send_buffer,"NSS4:%s\r\n",nss4_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss4_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss4_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss4_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss4_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss4_name,
+                                nss4_value,
+                                nss4_name,
+                                nss4_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS5) {
+
+               asprintf (&send_buffer,"NSS5:%s\r\n",nss5_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss5_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss5_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss5_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss5_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss5_name,
+                                nss5_value,
+                                nss5_name,
+                                nss5_value,
+                                warning_value,
+                                critical_value);
                }
 
-       } else {
+       } else if (vars_to_check==NSS6) {
+
+               asprintf (&send_buffer,"NSS6:%s\r\n",nss6_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss6_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss6_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss6_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss6_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss6_name,
+                                nss6_value,
+                                nss6_name,
+                                nss6_value,
+                                warning_value,
+                                critical_value);
+               }
+
+       } else if (vars_to_check==NSS7) {
+
+               asprintf (&send_buffer,"NSS7:%s\r\n",nss7_name);
+               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,_("CRITICAL - Value '%s' does not exist!"),nss7_name);
+                       result=STATE_CRITICAL;
+               }       else {
+                       nss7_value=strtoul(recv_buffer,NULL,10);
+                       if (check_critical_value==TRUE && nss7_value >= critical_value)
+                               result=STATE_CRITICAL;
+                       else if (check_warning_value==TRUE && nss7_value >= warning_value)
+                               result=STATE_WARNING;
+                       asprintf (&output_message,
+                                 _("%s is  %lu|%s=%lu;%lu;%lu;;"),
+                                nss7_name,
+                                nss7_value,
+                                nss7_name,
+                                nss7_value,
+                                warning_value,
+                                critical_value);
+               }
+
+
+}
+       else {
 
                output_message = strdup (_("Nothing to check!\n"));
                result=STATE_UNKNOWN;
@@ -710,14 +1300,16 @@ main(int argc, char **argv) {
 
        return result;
 }
-\f
+
+
+
 /* process command-line arguments */
 int process_arguments(int argc, char **argv) {
        int c;
 
        int option = 0;
        static struct option longopts[] =
-               { 
+               {
                        {"port",     required_argument,0,'p'},
                        {"timeout",  required_argument,0,'t'},
                        {"critical", required_argument,0,'c'},
@@ -759,14 +1351,12 @@ 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);
+                       usage5 ();
                        case 'h': /* help */
                                print_help();
                                exit(STATE_OK);
                        case 'V': /* version */
-                               print_revision(progname, revision);
+                               print_revision(progname, NP_VERSION);
                                exit(STATE_OK);
                        case 'H': /* hostname */
                                server_address=optarg;
@@ -778,7 +1368,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)
@@ -817,10 +1407,18 @@ int process_arguments(int argc, char **argv) {
                                        if (!strcmp(volume_name,""))
                                                volume_name = strdup ("SYS");
                                }
+                               else if (strncmp(optarg,"VMF",3)==0) {
+                                       vars_to_check=VMF;
+                                       volume_name = strdup (optarg+3);
+                                       if (!strcmp(volume_name,""))
+                                               volume_name = strdup ("SYS");
+                               }
                                else if (!strcmp(optarg,"DSDB"))
                                        vars_to_check=DSDB;
                                else if (!strcmp(optarg,"LOGINS"))
                                        vars_to_check=LOGINS;
+                               else if (!strcmp(optarg,"NRMH"))
+                                       vars_to_check=NRMH;
                                else if (!strcmp(optarg,"UPRB"))
                                        vars_to_check=UPRB;
                                else if (!strcmp(optarg,"PUPRB"))
@@ -840,6 +1438,18 @@ int process_arguments(int argc, char **argv) {
                                        if (!strcmp(volume_name,""))
                                                volume_name = strdup ("SYS");
                                }
+                               else if (strncmp(optarg,"VMP",3)==0) {
+                                       vars_to_check=VMP;
+                                       volume_name = strdup (optarg+3);
+                                       if (!strcmp(volume_name,""))
+                                               volume_name = strdup ("SYS");
+                               }
+                               else if (strncmp(optarg,"VMU",3)==0) {
+                                       vars_to_check=VMU;
+                                       volume_name = strdup (optarg+3);
+                                       if (!strcmp(volume_name,""))
+                                               volume_name = strdup ("SYS");
+                               }
                                else if (strncmp(optarg,"VPP",3)==0) {
                                        vars_to_check=VPP;
                                        volume_name = strdup (optarg+3);
@@ -866,12 +1476,94 @@ 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);
                                }
+                               else if (strncmp(optarg,"NRMP",4)==0) {
+                                       vars_to_check=NRMP;
+                                       nrmp_name = strdup (optarg+4);
+                                       if (!strcmp(nrmp_name,""))
+                                               nrmp_name = strdup ("AVAILABLE_MEMORY");
+                               }
+                               else if (strncmp(optarg,"NRMM",4)==0) {
+                                       vars_to_check=NRMM;
+                                       nrmm_name = strdup (optarg+4);
+                                       if (!strcmp(nrmm_name,""))
+                                               nrmm_name = strdup ("AVAILABLE_CACHE_MEMORY");
+
+                               }
+
+                               else if (strncmp(optarg,"NRMS",4)==0) {
+                                       vars_to_check=NRMS;
+                                       nrms_name = strdup (optarg+4);
+                                       if (!strcmp(nrms_name,""))
+                                               nrms_name = strdup ("USED_SWAP_SPACE");
+
+                               }
+
+                               else if (strncmp(optarg,"NSS1",4)==0) {
+                                       vars_to_check=NSS1;
+                                       nss1_name = strdup (optarg+4);
+                                       if (!strcmp(nss1_name,""))
+                                               nss1_name = strdup ("CURRENTBUFFERCACHESIZE");
+
+                               }
+
+                               else if (strncmp(optarg,"NSS2",4)==0) {
+                                       vars_to_check=NSS2;
+                                       nss2_name = strdup (optarg+4);
+                                       if (!strcmp(nss2_name,""))
+                                               nss2_name = strdup ("CACHEHITS");
+
+                               }
+
+                               else if (strncmp(optarg,"NSS3",4)==0) {
+                                       vars_to_check=NSS3;
+                                       nss3_name = strdup (optarg+4);
+                                       if (!strcmp(nss3_name,""))
+                                               nss3_name = strdup ("CACHEGITPERCENT");
+
+                               }
+
+                               else if (strncmp(optarg,"NSS4",4)==0) {
+                                       vars_to_check=NSS4;
+                                       nss4_name = strdup (optarg+4);
+                                       if (!strcmp(nss4_name,""))
+                                               nss4_name = strdup ("CURRENTOPENCOUNT");
+
+                               }
+
+                               else if (strncmp(optarg,"NSS5",4)==0) {
+                                       vars_to_check=NSS5;
+                                       nss5_name = strdup (optarg+4);
+                                       if (!strcmp(nss5_name,""))
+                                               nss5_name = strdup ("CACHEMISSES");
+
+                               }
+
+
+                               else if (strncmp(optarg,"NSS6",4)==0) {
+                                       vars_to_check=NSS6;
+                                       nss6_name = strdup (optarg+4);
+                                       if (!strcmp(nss6_name,""))
+                                               nss6_name = strdup ("PENDINGWORKSCOUNT");
+
+                               }
+
+
+                               else if (strncmp(optarg,"NSS7",4)==0) {
+                                       vars_to_check=NSS7;
+                                       nss7_name = strdup (optarg+4);
+                                       if (!strcmp(nss7_name,""))
+                                               nss7_name = strdup ("CACHESIZE");
+
+                               }
+
+
                                else
                                        return ERROR;
                                break;
@@ -896,102 +1588,103 @@ int process_arguments(int argc, char **argv) {
 
 
 
-
-
-\f
 void print_help(void)
 {
        char *myport;
        asprintf (&myport, "%d", PORT);
 
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        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);
+       printf ("%s\n", _("This plugin attempts to contact the MRTGEXT NLM running on a"));
+  printf ("%s\n", _("Novell server to gather the requested system information."));
+
+  printf ("\n\n");
 
        print_usage();
 
-       printf (_(UT_HELP_VRSN));
-
-       printf (_(UT_HOST_PORT), 'p', myport);
-
-       printf (_("\
- -v, --variable=STRING\n\
-    Variable to check.  Valid variables include:\n\
-      LOAD1     = 1 minute average CPU load\n\
-      LOAD5     = 5 minute average CPU load\n\
-      LOAD15    = 15 minute average CPU load\n\
-      CSPROCS   = number of current service processes (NW 5.x only)\n\
-      ABENDS    = number of abended threads (NW 5.x only)\n\
-      UPTIME    = server uptime\n"));
-
-       printf (_("\
-      LTCH      = percent long term cache hits\n\
-      CBUFF     = current number of cache buffers\n\
-      CDBUFF    = current number of dirty cache buffers\n\
-      DCB       = dirty cache buffers as a percentage of the total\n\
-      TCB       = dirty cache buffers as a percentage of the original\n"));
-
-       printf (_("\
-      OFILES    = number of open files\n\
-      VPF<vol>  = percent free space on volume <vol>\n\
-      VKF<vol>  = KB of free space on volume <vol>\n\
-      VPP<vol>  = percent purgeable space on volume <vol>\n\
-      VKP<vol>  = KB of purgeable space on volume <vol>\n\
-      VPNP<vol> = percent not yet purgeable space on volume <vol>\n\
-      VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"));
-
-       printf (_("\
-      LRUM      = LRU sitting time in minutes\n\
-      LRUS      = LRU sitting time in seconds\n\
-      DSDB      = check to see if DS Database is open\n\
-      DSVER     = NDS version\n\
-      UPRB      = used packet receive buffers\n\
-      PUPRB     = percent (of max) used packet receive buffers\n\
-      SAPENTRIES = number of entries in the SAP table\n\
-      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"));
-
-       printf (_("\
-      TSYNC     = timesync status \n\
-      LOGINS    = check to see if logins are enabled\n\
-      CONNS     = number of currently licensed connections\n\
-      NLM:<nlm> = check if NLM is loaded and report version\n\
-                  (e.g. \"NLM:TSANDS.NLM\")\n"));
-
-       printf (_("\
- -w, --warning=INTEGER\n\
-    Threshold which will result in a warning status\n\
- -c, --critical=INTEGER\n\
-    Threshold which will result in a critical status\n\
- -o, --osversion\n\
-    Include server version string in results\n"));
-
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-
-       printf (_("\n\
-Notes:\n\
-- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG\n\
-  extension for NetWare be loaded on the Novell servers you wish to check.\n\
-  (available from http://www.engr.wisc.edu/~drews/mrtg/)\n\
-- Values for critical thresholds should be lower than warning thresholds\n\
-  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, \n\
-  TCB, LRUS and LRUM.\n"));
-
-       printf (_(UT_SUPPORT));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
+
+       printf (UT_HOST_PORT, 'p', myport);
+
+       printf (" %s\n", "-v, --variable=STRING");
+  printf ("   %s\n", _("Variable to check.  Valid variables include:"));
+  printf ("    %s\n", _("LOAD1     = 1 minute average CPU load"));
+  printf ("    %s\n", _("LOAD5     = 5 minute average CPU load"));
+  printf ("    %s\n", _("LOAD15    = 15 minute average CPU load"));
+  printf ("    %s\n", _("CSPROCS   = number of current service processes (NW 5.x only)"));
+  printf ("    %s\n", _("ABENDS    = number of abended threads (NW 5.x only)"));
+  printf ("    %s\n", _("UPTIME    = server uptime"));
+       printf ("    %s\n", _("LTCH      = percent long term cache hits"));
+  printf ("    %s\n", _("CBUFF     = current number of cache buffers"));
+  printf ("    %s\n", _("CDBUFF    = current number of dirty cache buffers"));
+  printf ("    %s\n", _("DCB       = dirty cache buffers as a percentage of the total"));
+  printf ("    %s\n", _("TCB       = dirty cache buffers as a percentage of the original"));
+       printf ("    %s\n", _("OFILES    = number of open files"));
+  printf ("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
+  printf ("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
+  printf ("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
+  printf ("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
+  printf ("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
+  printf ("    %s\n", _("    VPP<vol>  = percent purgeable space on volume <vol>"));
+  printf ("    %s\n", _("    VKP<vol>  = KB of purgeable space on volume <vol>"));
+  printf ("    %s\n", _("    VPNP<vol> = percent not yet purgeable space on volume <vol>"));
+  printf ("    %s\n", _("    VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
+  printf ("    %s\n", _("    LRUM      = LRU sitting time in minutes"));
+  printf ("    %s\n", _("    LRUS      = LRU sitting time in seconds"));
+  printf ("    %s\n", _("    DSDB      = check to see if DS Database is open"));
+  printf ("    %s\n", _("    DSVER     = NDS version"));
+  printf ("    %s\n", _("    UPRB      = used packet receive buffers"));
+  printf ("    %s\n", _("    PUPRB     = percent (of max) used packet receive buffers"));
+  printf ("    %s\n", _("    SAPENTRIES = number of entries in the SAP table"));
+  printf ("    %s\n", _("    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
+  printf ("    %s\n", _("    TSYNC     = timesync status"));
+  printf ("    %s\n", _("    LOGINS    = check to see if logins are enabled"));
+  printf ("    %s\n", _("    CONNS     = number of currently licensed connections"));
+  printf ("    %s\n", _("    NRMH      = NRM Summary Status"));
+  printf ("    %s\n", _("    NRMP<stat> = Returns the current value for a NRM health item"));
+  printf ("    %s\n", _("    NRMM<stat> = Returns the current memory stats from NRM"));
+  printf ("    %s\n", _("    NRMS<stat> = Returns the current Swapfile stats from NRM"));
+  printf ("    %s\n", _("    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
+  printf ("    %s\n", _("    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
+  printf ("    %s\n", _("    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
+  printf ("    %s\n", _("    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
+  printf ("    %s\n", _("    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
+  printf ("    %s\n", _("    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
+  printf ("    %s\n", _("    NLM:<nlm> = check if NLM is loaded and report version"));
+  printf ("    %s\n", _("                (e.g. NLM:TSANDS.NLM)"));
+  printf ("\n");
+       printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Threshold which will result in a warning status"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Threshold which will result in a critical status"));
+  printf (" %s\n", "-o, --osversion");
+  printf ("    %s\n", _("Include server version string in results"));
+
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+  printf ("\n");
+  printf ("%s\n", _("Notes:"));
+       printf (" %s\n", _("- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"));
+  printf (" %s\n", _("  extension for NetWare be loaded on the Novell servers you wish to check."));
+  printf (" %s\n", _("  (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
+  printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
+  printf (" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
+  printf (" %s\n", _("  TCB, LRUS and LRUM."));
+#ifdef NP_EXTRA_OPTS
+  printf (" -%s", UT_EXTRA_OPTS_NOTES);
+#endif
+
+       printf (UT_SUPPORT);
 }
 
 
 
-
 void print_usage(void)
 {
-       printf (_("\
-Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
-  [-t timeout].\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+  printf (_("Usage:"));
+       printf ("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n",progname);
 }