Changeset 7da80b5 in nscp for trunk/modules/CheckDisk

Timestamp:

05/23/05 21:24:32 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

e93e741

Parents:

3b8eb61

Message:

2005-05-23 MickeM

+ Added obfuscated password support
+ Added some more debug info on commands (returncode, and input args)
+ Added some more comments ot the NSC.ini
+ Added central password "override"
+ Added central "host override"
+ Fixed bug with external commands always getting WARNING state

2005-05-22 MickeM

+ Added debug outout for command
+ Added timestamps for log-to-file (date_mask to configure format)
+ Added support for "no password" with check_nt
+ Added log of bad password on NSClient requests.

• Some threading issues fixed (I hate threading :)

File:

• trunk/modules/CheckDisk/CheckDisk.cpp (modified) (2 diffs)

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -204 +204 @@
       return NSCAPI::returnUNKNOWN;
     }
+    //10597515264&80015491072
 
     if (bNSClient) {
-      message += strEx::itos(totalNumberOfFreeBytes.QuadPart) + "&";
-      message += strEx::itos(totalNumberOfBytes.QuadPart) + "&";
+      if (!message.empty())
+        message += "&";
+      message += strEx::itos(totalNumberOfFreeBytes.QuadPart);
+      message += "&";
+      message += strEx::itos(totalNumberOfBytes.QuadPart);
     } else {
       std::string tStr;
@@ -236 +240 @@
   if (message.empty())
     message = "All drive sizes are within bounds.";
-  else
+  else if (!bNSClient)
     message = NSCHelper::translateReturn(returnCode) + ": " + message;
   return returnCode;