Option to verify check_nt version (799098 - Steve Hanselman)

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

diff --git a/AUTHORS b/AUTHORS
index 76013a95905242b20eef5cef298154bc2b44479f..f50d0e79d940659feaacd34f5e79ba572951cd91 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,3 +77,4 @@ Jeffery Blank
 Jason Burnett
 Richard Brodie
 Patrick Allen
+Steve Hanselman

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index c0d6c4e5c296e7e3db39c668f5ad1e54cc651ae2..75936620c7a613bde1c711a2c23cbd2b2929b73a 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -58,7 +58,6 @@ char *req_password=NULL;
 unsigned long lvalue_list[MAX_VALUE_LIST];
 unsigned long warning_value=0L;
 unsigned long critical_value=0L;
-int check_value_list=FALSE;
 int check_warning_value=FALSE;
 int check_critical_value=FALSE;
 enum checkvars vars_to_check = CHECK_NONE;
@@ -115,8 +114,13 @@ int main(int argc, char **argv){
 
                asprintf(&send_buffer, "%s&1", req_password);
                fetch_data (server_address, server_port, send_buffer);
-               output_message = strdup (recv_buffer);
-               return_code=STATE_OK;
+               if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
+                       asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+                       return_code = STATE_WARNING;
+               } else {
+                       asprintf (&output_message, recv_buffer);
+                       return_code = STATE_OK;
+               }
                break;
 
        case CHECK_CPULOAD:
@@ -536,7 +540,8 @@ Windows NT/2000/XP server.\n\n"));
 -v, --variable=STRING\n\
   Variable to check.  Valid variables are:\n"));
   printf (_("\
-   CLIENTVERSION = Get the NSClient version\n"));
+   CLIENTVERSION = Get the NSClient version\n\
+     If -l <version> is specified, will return warning if versions differ.\n"));
   printf (_("\
    CPULOAD = Average CPU load on last x minutes.\n\
      Request a -l parameter with the following syntax:\n\