Changeset 261

Timestamp:

03/08/10 22:02:22 (5 months ago)

Author:

mickem

Message:

+ Added new option append-filter-<key>=<value> to CheckEventLog to allow "and" of filter rules.

CheckEventLog file=application file=system filter=out MaxWarn=1 MaxCrit=1 filter-eventID=ne:1 filter-eventID=eq:1 append-filter-eventSource==SecurityCenter? truncate=1023 unique descriptions "syntax=%source%: %id% (%count%)"

+ Added debug option to CheckEventLog (to allow settingdebug on per-check)
+ Added obfuscated_password to NSCA section
+ Added so "global" ([Settings] password=...) passwords are read from the NSCA module

Also various changes to make it build with latest version of boost build.

Location:

branches/stable

Files:

• AutoBuild.h (modified) (1 diff)
• Jamroot (modified) (3 diffs)
• NSClient++-2005.vcproj (modified) (1 diff)
• bjam/openssl.jam (modified) (4 diffs)
• build.bat (modified) (1 diff)
• changelog (modified) (1 diff)
• env.bat (modified) (8 diffs)
• helpers/XAutoBuild (modified) (1 prop)
• helpers/XAutoBuild/AutoBuild.h (modified) (1 diff)
• helpers/installer (modified) (1 prop)
• helpers/installer_dll (modified) (1 prop)
• helpers/installer_dll_fw/installer_dll_fw.vcproj (modified) (7 diffs)
• include/checkHelpers.hpp (modified) (7 diffs)
• include/config.h (modified) (1 diff)
• include/filter_framework.hpp (modified) (6 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (35 diffs)
• modules/CheckDisk/CheckDisk.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog-2005.vcproj (modified) (2 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (8 diffs)
• modules/CheckWMI/Jamfile (modified) (1 diff)
• modules/LUAScript/LUAScript-2005.vcproj (modified) (12 diffs)
• modules/NRPEClient/Jamfile (modified) (1 diff)
• modules/NRPEListener/Jamfile (modified) (1 diff)
• modules/NSCAAgent/NSCAAgent-2005.vcproj (modified) (12 diffs)
• modules/NSCAAgent/NSCAThread.cpp (modified) (1 diff)
• release-build.bat (modified) (1 diff)
• wix.jam (modified) (1 diff)
• x64-build.bat (modified) (2 diffs)
• x86-build.bat (modified) (2 diffs)

branches/stable/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,8,10
-#define PRODUCTVER     0,3,8,10
-#define STRFILEVER     _T("0.3.8.10")
-#define STRPRODUCTVER  _T("0.3.8.10")
-#define STRPRODUCTDATE  _T("2010-01-24")
+#define FILEVER        0,3,8,27
+#define PRODUCTVER     0,3,8,27
+#define STRFILEVER     _T("0.3.8.27")
+#define STRPRODUCTVER  _T("0.3.8.27")
+#define STRPRODUCTDATE  _T("2010-03-08")
 #endif // AUTOBUILD_H

branches/stable/Jamroot

@@ -13 +13 @@
 feature.compose <character-set>multibyte : <define>_MBCS ;
 
+path-constant TOP : . ;
 
 local toolset = [ MATCH "^--toolset=(.*)" : [ modules.peek : ARGV ] ] ;
@@ -51 +52 @@
 path-constant BOOST_STAGE_LOCATE : $(stage-locate) ;
 
-if $(toolset) = "msvc" {
+if ( $(toolset) = "msvc" || $(toolset) = "msvc-8.0" ) {
   using bjam/openssl : : $(TOP)/lib-source/openssl-0.9.8g/include $(TOP)/lib ;
   using bjam/boost : : $(TOP)/lib-source/boost_1_35_0 $(TOP)/lib ;
@@ -172 +173 @@
     ;
 
-# all-modules = NSCAAgent ;
+# all-modules = CheckEventLog CheckExternalScripts CheckHelpers CheckSystem CheckTaskSched ;
+# all-modules = CheckWMI DebugLogMetrics FileLogger LUAScript ;
+# all-modules = NRPEClient NSCAAgent NSClientListener SysTray ; 
+# all-modules = NRPEClient NRPEListener NSCAAgent NSClientListener SysTray; 
 
 all-scripts =

branches/stable/NSClient++-2005.vcproj

@@ -3527 +3527 @@
           <Tool
             Name="VCCustomBuildTool"
-            CommandLine="echo Copying $(InputFileName)...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(InputDir)\$(OutDir)&quot;&quot;&#x0D;&#x0A;"
+            CommandLine="echo Copying $(InputFileName) [cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(InputDir)\$(OutDir)&quot;&quot;]...&#x0D;&#x0A;cmd /c &quot;copy &quot;$(InputDir)\$(InputFileName)&quot; &quot;$(InputDir)\$(OutDir)&quot;&quot;&#x0D;&#x0A;"
             Outputs="$(InputDir)\$(OutDir)\$(InputFileName)"
           />

branches/stable/bjam/openssl.jam

@@ -147 +147 @@
 {
   local result ;
+  result += <source>$(TOP)/include/Socket.cpp ;
   if ( $(.enabled) = true ) {
     result += <define>USE_OPENSSL ;
@@ -161 +162 @@
   : # default-build
   : # usage-requirements
+    <conditional>@socket-usage-requirements
   ;
 
@@ -166 +168 @@
 {
   local result ;
-  result += <source>include/Socket.cpp ;
+  result += <source>$(TOP)/include/Socket.cpp ;
   if ( $(.enabled) = true ) {
-    result += <source>include/sslSocket.cpp ;
+    result += <source>$(TOP)/include/sslSocket.cpp ;
     result += <source>openssl ;
   }
@@ -174 +176 @@
 }
 
+rule socket-usage-requirements ( properties * )
+{
+  local result ;
+  result += <source>$(TOP)/include/Socket.cpp ;
+  if ( $(.enabled) = true ) {
+    result += <source>$(TOP)/include/sslSocket.cpp ;
+    result += <source>openssl ;
+  }
+  return $(result) ;
+}
+

branches/stable/build.bat

@@ -3 +3 @@
 
 echo :: %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries >> build.log
-%jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries
+        %jam% --toolset=msvc --with-lua=%LUA_SOURCE% --with-openssl --include-path=%NSCP_INCLUDE% --with-boost --with-cryptopp=%CRYPTOPP_SOURCE% runtime-link=static warnings=off --with-psdk="%PLATTFORM_SDK_INCLUDE%" %* build-binaries
 if %ERRORLEVEL% == 1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log
 
 echo :: %jam% --toolset=msvc warnings=off %* build-archives >> build.log
-%jam% --toolset=msvc warnings=off %* build-archives
+        %jam% --toolset=msvc warnings=off %* build-archives
 if %ERRORLEVEL% == 1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log
 
 echo :: %jam% --toolset=wix "--wix=%WIX_PATH%" %1=%2 %3=%4 build-installer >> build.log
-%jam% --toolset=wix "--wix=%WIX_PATH%" %1=%2 %3=%4 build-installer
+        %jam% --toolset=wix "--wix=%WIX_PATH%" %1=%2 %3=%4 build-installer
 if %ERRORLEVEL% == 1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log

branches/stable/changelog

@@ -6 +6 @@
  * Fix depend onservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2009-03-08 MickeM
+ + Added new option append-filter-<key>=<value> to CheckEventLog to allow "and" of filter rules.
+   CheckEventLog file=application file=system filter=out MaxWarn=1 MaxCrit=1 filter-eventID=ne:1 filter-eventID=eq:1 append-filter-eventSource==SecurityCenter truncate=1023 unique descriptions "syntax=%source%: %id% (%count%)"
+ + Added debug option to CheckEventLog (to allow settingdebug on per-check)
+ + Added obfuscated_password to NSCA section
+ + Added so "global" ([Settings] password=...) passwords are read from the NSCA module
+ 
+2009-02-26 MickeM
+ * Changed fo missing files and such generate an error
+ * Added option to return error messages to the client [CheckDisk] show_errors=1 (defauilt is off 0)
+ * Added warning message ewhen numerical filters evaluate to zero (and are not 0)
+ * Fixed major issue with date mathing in CheckFile* which was not working at all.
 
 2009-01-24 MickeM

branches/stable/env.bat

@@ -6 +6 @@
 rem SET jam=C:\src\tools\boost-jam-3.1.17\bin.ntx86\bjam.exe
 rem SET jam=D:\source\tools\bjam.exe
-set jam=C:\src\tools\nightly\boost-build\jam_src\bin.ntx86\bjam.exe
+set jam=C:\source\libraries\boost_1_42_0\bjam.exe
 
 rem #
@@ -14 +14 @@
 rem #
 rem SET BOOST_BUILD_PATH=D:\tools\boost-build
- SET BOOST_BUILD_PATH=C:\src\lib-src\boost_1_39_0\tools\build\v2
-rem  SET BOOST_BUILD_PATH=C:\src\tools\beta\boost-build
+rem SET BOOST_BUILD_PATH=C:\src\lib-src\boost_1_39_0\tools\build\v2
+SET BOOST_BUILD_PATH=C:\source\libraries\boost_1_42_0\tools\build\v2
 rem set BOOST_BUILD_PATH=D:\source\boost-build
 rem set BOOST_BUILD_PATH=C:\src\tools\nightly\boost-build\
@@ -24 +24 @@
 rem # Set the path to your extra include directpy (openssl/boost/*)
 rem #
-SET TARGET_INC_DIR=C:\src\include
+SET TARGET_INC_DIR=C:\source\include
+SET BOOST_INCLUDE_DIR=%TARGET_INC_DIR%\boost-1_42\
 rem set TARGET_INC_DIR=d:\source\include
 SET NSCP_INCLUDE=%TARGET_INC_DIR%
@@ -32 +33 @@
 rem # Set the path to your extra library directory (openssl/boost/*)
 rem #
-SET TARGET_LIB_DIR=c:\src\lib
+SET TARGET_LIB_DIR=c:\source\lib
 rem SET TARGET_LIB_DIR=D:\source\lib
 rem #
@@ -46 +47 @@
 rem #
 rem set LUA_SOURCE=D:\source\NSCP-stable\lib-source\LUA\src\lua-5.1.2
-set LUA_SOURCE=C:\src\lib-src\lua-5.1.4
+set LUA_SOURCE=C:\source\libraries\lua-5.1.4
 rem #
 rem ########################
@@ -53 +54 @@
 rem #
 rem SET PLATTFORM_SDK=D:\Program\Microsoft Platform SDK for Windows Server 2003 R2
-SET PLATTFORM_SDK=c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2
+rem SET PLATTFORM_SDK=c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2
+SET PLATTFORM_SDK=c:\Program Files\Microsoft Platform SDK
 rem #
 rem # Setup various relative paths (might need to tweak)
@@ -67 +69 @@
 rem # Set the path to your WiX installation
 rem #
-SET WIX_PATH=C:\Program Files\Windows Installer XML
+SET WIX_PATH=c:\source\tools\wix-2.0
 rem #
 rem ########################
@@ -74 +76 @@
 rem #
 rem SET CRYPTOPP_SOURCE=D:\source\libs-c\crypto++-5.6.0
-SET CRYPTOPP_SOURCE="C:\src\lib-src\Crypto++5.6.0"
+SET CRYPTOPP_SOURCE=C:\source\libraries\cryptopp-5.6.0
 rem ########################
 rem #
 rem #
 rem #
+SET ZIP7_PATH=C:\Program Files\7-Zip
+SET PERL_PATH=C:\Perl64\bin
+SET TOOLS_DIR=c:\source\tools
+SET PUTTY_DIR="c:\Program Files (x86)\PuTTY"
 
-SET TOOLS_DIR=c:\src\tools\;%ProgramFiles%\7-Zip\
-
-
-set PATH=%PATH%;%TOOLS_DIR%
+set PATH=%PATH%;%ZIP7_PATH%;%PERL_PATH%;%TOOLS_DIR%;%PUTTY_DIR%
 
 rem # Used for building "other" stuff as "I do it".

branches/stable/helpers/XAutoBuild

@@ -1 +1 @@
 Debug
 obj
+AutoBuild.h.bak

@@ -1 +1 @@
 Debug
 obj
+AutoBuild.h.bak

branches/stable/helpers/XAutoBuild/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        1,0,0,13
-#define PRODUCTVER     1,0,0,13
-#define STRFILEVER     "1.0.0.13"
-#define STRPRODUCTVER  "1.0.0.13"
-#define STRPRODUCTDATE  "2007-11-03"
+#define FILEVER        1,0,0,14
+#define PRODUCTVER     1,0,0,14
+#define STRFILEVER     _T("1.0.0.14")
+#define STRPRODUCTVER  _T("1.0.0.14")
+#define STRPRODUCTDATE  _T("2010-02-27")
 #endif // AUTOBUILD_H

branches/stable/helpers/installer

@@ -1 +1 @@
 bin.v2
+bin
+obj

@@ -1 +1 @@
 bin.v2
+bin
+obj

branches/stable/helpers/installer_dll

@@ -2 +2 @@
 installer_dll.ncb
 installer_dll.vcproj.DESKTOP.mickem.user
+*.user

@@ -2 +2 @@
 installer_dll.ncb
 installer_dll.vcproj.DESKTOP.mickem.user
+*.user

branches/stable/helpers/installer_dll_fw/installer_dll_fw.vcproj

@@ -44 +44 @@
         Optimization="0"
         AdditionalIncludeDirectories="..\..\include"
+        PreprocessorDefinitions="USE_PSDK"
         MinimalRebuild="true"
         BasicRuntimeChecks="3"
@@ -119 +120 @@
         Optimization="0"
         AdditionalIncludeDirectories="..\..\include"
+        PreprocessorDefinitions="USE_PSDK"
         MinimalRebuild="true"
         BasicRuntimeChecks="3"
@@ -138 +140 @@
         Name="VCLinkerTool"
         AdditionalDependencies="Msi.lib"
-        ModuleDefinitionFile="main_dll.def"
+        ModuleDefinitionFile="firewall.def"
         GenerateDebugInformation="true"
         TargetMachine="17"
@@ -193 +195 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="..\..\include"
+        PreprocessorDefinitions="USE_PSDK"
         RuntimeLibrary="2"
         WarningLevel="3"
@@ -210 +213 @@
         Name="VCLinkerTool"
         AdditionalDependencies="Msi.lib"
-        ModuleDefinitionFile="main_dll.def"
+        ModuleDefinitionFile="firewall.def"
         GenerateDebugInformation="true"
         OptimizeReferences="2"
@@ -268 +271 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="..\..\include"
+        PreprocessorDefinitions="USE_PSDK"
         RuntimeLibrary="2"
         WarningLevel="3"
@@ -286 +290 @@
         AdditionalDependencies="Msi.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
-        ModuleDefinitionFile="main_dll.def"
+        ModuleDefinitionFile="firewall.def"
         GenerateDebugInformation="false"
         OptimizeReferences="2"

branches/stable/include/checkHelpers.hpp

@@ -329 +329 @@
     }
     static TType parse(std::wstring s) {
-      return strEx::stoi64_as_BKMG(s);
+      TType val = strEx::stoi64_as_BKMG(s);
+      if (val == 0 && s.length() > 1 && s[0] != L'0')
+        NSC_LOG_MESSAGE_STD(_T("Maybe this is not what you want: ") + s + _T(" = ") + strEx::itos(val));
+      return val;
     }
     static TType parse_percent(std::wstring s) {
@@ -364 +367 @@
   public:
     static TType parse(std::wstring s) {
-      return strEx::stoi64_as_time(s);
+      TType val = strEx::stoi64_as_time(s);
+      if (val == 0 && s.length() > 1 && s[0] != L'0')
+        NSC_LOG_MESSAGE_STD(_T("Maybe this is not what you want: ") + s + _T(" = 0"));
+      return val;
     }
     static TType parse_percent(std::wstring s) {
@@ -397 +403 @@
   public:
     static int parse(std::wstring s) {
-      return strEx::stoi(s);
+      int val = strEx::stoi(s);
+      if (val == 0 && s.length() > 1 && s[0] != L'0')
+        NSC_LOG_MESSAGE_STD(_T("Maybe this is not what you want: ") + s + _T(" = 0"));
+      return val;
     }
     static int parse_percent(std::wstring s) {
@@ -427 +436 @@
   public:
     static __int64 parse(std::wstring s) {
-      return strEx::stoi64(s);
+      __int64 val = strEx::stoi64(s);
+      if (val == 0 && s.length() > 1 && s[0] != L'0')
+        NSC_LOG_MESSAGE_STD(_T("Maybe this is not what you want: ") + s + _T(" = 0"));
+      return val;
     }
     static __int64 parse_percent(std::wstring s) {
@@ -852 +864 @@
         return true;
       } else {
-        NSC_DEBUG_MSG_STD(_T("Missing bounds for check: ") + lable);
+        NSC_LOG_MESSAGE_STD(_T("Missing bounds for check: ") + lable);
         //std::cout << "No bounds specified..." << std::endl;
       }
@@ -927 +939 @@
         return min.gatherPerfData(alias, value, warn.min.getPerfBound(value), crit.min.getPerfBound(value));
       } else {
-        NSC_DEBUG_MSG_STD(_T("Missing bounds for maxmin-bounds check: ") + alias);
+        NSC_LOG_MESSAGE_STD(_T("Missing bounds for maxmin-bounds check: ") + alias);
         return min.gatherPerfData(alias, value, 0, 0);
       }
@@ -1025 +1037 @@
         return eq.gatherPerfData(alias, value, warn.eq.getPerfBound(value), crit.eq.getPerfBound(value));
       } else {
-        NSC_DEBUG_MSG_STD(_T("Missing bounds for: ") + alias);
+        NSC_LOG_MESSAGE_STD(_T("Missing bounds for: ") + alias);
       }
     }

branches/stable/include/config.h

@@ -157 +157 @@
 #define C_SYSTEM_ENUMPROC_METHOD_DEFAULT C_SYSTEM_ENUMPROC_METHOD_AUTO
 
+#define CHECK_DISK_SECTION_TITLE _T("Check Disk")
+#define CHECK_DISK_SHOW_ERRORS _T("show_errors")
+#define CHECK_DISK_SHOW_ERRORS_DEFAULT 0
 
 #define EVENTLOG_SECTION_TITLE _T("Eventlog")

branches/stable/include/filter_framework.hpp

@@ -68 +68 @@
     struct numeric_max_filter {
       static bool filter(TType filter, TType value) {
+        //std::wcout << filter << _T(" >= ") << value << std::endl;
         return value >= filter;
       }
@@ -113 +114 @@
       static std::wstring parse(std::wstring str) {
         return str;
+      }
+      static std::wstring print(std::wstring value) {
+        return value;
       }
     };
@@ -194 +198 @@
   template <typename TFilterType, typename TValueType, class THandler, class TFilter>
   struct filter_one {
-    TFilterType filter;
+    TFilterType filter_;
     bool hasFilter_;
     std::wstring value_;
     filter_one() : hasFilter_(false) {}
-    filter_one(const filter_one &other) : hasFilter_(other.hasFilter_), filter(other.filter), value_(other.value_) {
+    filter_one(const filter_one &other) : hasFilter_(other.hasFilter_), filter_(other.filter_), value_(other.value_) {
     }
 
@@ -205 +209 @@
     }
     bool matchFilter(const TValueType value) const {
-      return TFilter::filter(filter, value);
+      return TFilter::filter(filter_, value);
     }
     const filter_one & operator=(std::wstring value) {
@@ -211 +215 @@
       hasFilter_ = false;
       try {
-        filter = THandler::parse(value);
+        filter_ = THandler::parse(value);
         hasFilter_ = true;
       } catch (handlers::handler_exception e) {
@@ -366 +370 @@
       return *this;
     }
-#define NSCP_FF_DEBUG_NUM(key) if (key.hasFilter()) return _T( # key ) + key.value_;
+#define NSCP_FF_DEBUG_NUM(key) if (key.hasFilter()) strEx::append_list(str, std::wstring(_T( # key )) + _T(" ") + key.getValue(), _T(","));
     std::wstring to_string() const {
+      std::wstring str;
       NSCP_FF_DEBUG_NUM(max);
       NSCP_FF_DEBUG_NUM(min);
       NSCP_FF_DEBUG_NUM(eq);
       NSCP_FF_DEBUG_NUM(neq);
-      //NSCP_FF_DEBUG_NUM(inList);
-      return _T(" MISSING! ");
+      NSCP_FF_DEBUG_NUM(inList);
+      return str;
     }
     std::wstring getValue() const {

branches/stable/modules/CheckDisk/CheckDisk.cpp

@@ -36 +36 @@
 }
 
-CheckDisk::CheckDisk() {
+CheckDisk::CheckDisk() : show_errors_(false) {
 }
 CheckDisk::~CheckDisk() {
@@ -50 +50 @@
     NSCModuleHelper::registerCommand(_T("CheckDriveSize"), _T("Check the size (free-space) of a drive or volume."));
     NSCModuleHelper::registerCommand(_T("CheckFile"), _T("Check various aspects of a file and/or folder."));
+
+    show_errors_ = NSCModuleHelper::getSettingsInt(CHECK_DISK_SECTION_TITLE, CHECK_DISK_SHOW_ERRORS, CHECK_DISK_SHOW_ERRORS_DEFAULT)==1;
   } catch (NSCModuleHelper::NSCMHExcpetion &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
@@ -72 +74 @@
   virtual void report_error(std::wstring error) = 0;
   virtual void report_warning(std::wstring error) = 0;
+  virtual bool has_error() = 0;
+  virtual std::wstring get_error() = 0;
 };
 
@@ -86 +90 @@
 struct get_size : public baseFinderFunction
 {
-  bool error;
-  get_size() : size(0), error(false) { }
+  get_size() : size(0) { }
   result_type operator()(argument_type ffd) {
     if (!is_directory(ffd.wfd.dwFileAttributes)) {
@@ -97 +100 @@
     return size;
   }
-  inline const bool hasError() const {
-    return error;
-  }
   inline void setError(error_reporter *errors, std::wstring msg) {
     if (errors != NULL)
       errors->report_error(msg);
-    error = true;
   }
 private:  
@@ -110 +109 @@
 
 template <class finder_function>
-void recursive_scan(std::wstring dir, std::wstring pattern, int current_level, int max_level, finder_function & f, error_reporter * errors, bool debug) {
+void recursive_scan(std::wstring dir, std::wstring pattern, int current_level, int max_level, finder_function & f, error_reporter * errors, bool debug, bool recursive = false) {
   if ((max_level != -1) && (current_level > max_level))
     return;
@@ -116 +115 @@
 
   DWORD fileAttr = GetFileAttributes(dir.c_str());
+  if ((fileAttr == INVALID_FILE_ATTRIBUTES)&&(!recursive)) {
+    errors->report_error(_T("Invalid file specified: ") + dir);
+  } else if (fileAttr == INVALID_FILE_ATTRIBUTES) {
+    errors->report_warning(_T("Invalid file specified: ") + dir);
+  }
   if (debug) NSC_DEBUG_MSG_STD(_T("Input is: ") + dir + _T(" / ") + strEx::ihextos(fileAttr));
 
@@ -127 +131 @@
       f(file_finder_data(wfd, single_path.first, errors));
       FindClose(hFind);
+    } else {
+      NSC_DEBUG_MSG_STD(_T("File was NOT found!"));
     }
     return;
@@ -147 +153 @@
       if (is_directory(wfd.dwFileAttributes)) {
         if ( (wcscmp(wfd.cFileName, _T(".")) != 0) && (wcscmp(wfd.cFileName, _T("..")) != 0) )
-          recursive_scan<finder_function>(dir + _T("\\") + wfd.cFileName, pattern, current_level+1, max_level, f, errors, debug);
+          recursive_scan<finder_function>(dir + _T("\\") + wfd.cFileName, pattern, current_level+1, max_level, f, errors, debug, true);
       }
     } while (FindNextFile(hFind, &wfd));
@@ -355 +361 @@
 
 class NSC_error : public error_reporter {
+  int error_count_;
+  int warning_count_;
+  std::wstring first_error_;
+  std::wstring last_error_;
+public:
+  NSC_error() : error_count_(0), warning_count_(0) {}
   void report_error(std::wstring error) {
+    if (error_count_==0)
+      first_error_ = error;
+    else
+      last_error_ = error;
+    error_count_++;
     NSC_LOG_ERROR(error);
   }
   void report_warning(std::wstring error) {
     NSC_LOG_MESSAGE(error);
+  }
+  std::wstring get_error() {
+    return strEx::itos(error_count_) + _T(" errors and ") + strEx::itos(warning_count_) + _T(" warnings where returned: ") + first_error_;
+  }
+  bool has_error() {
+    return error_count_ > 0;
   }
 };
@@ -431 +454 @@
     pattern_type splitpath = split_pattern(path.data);
     recursive_scan<get_size>(splitpath.first, splitpath.second, -1, -1, sizeFinder, &errors, debug);
-    if (sizeFinder.hasError()) {
-      message = _T("File not found check log for details");
+    if (errors.has_error()) {
+      if (show_errors_)
+        message = errors.get_error();
+      else
+        message = _T("Check contains error. Check log for details (or enable show_errors in nsc.ini)");
       return NSCAPI::returnUNKNOWN;
     }
@@ -454 +480 @@
   bool has_error;
 
-  static file_info get(std::wstring path, std::wstring file) {
-    return get_2(path, file);
-  }
-  static file_info get(file_finder_data data) {
-    return file_info(data.wfd, data.path, data.wfd.cFileName);
-  }
-
-  static file_info get_2(std::wstring path, std::wstring file) {
+  static file_info get(__int64 now, std::wstring path, std::wstring file) {
+    return get_2(now, path, file);
+  }
+  static file_info get(__int64 now, file_finder_data data) {
+    return file_info(now, data.wfd, data.path, data.wfd.cFileName);
+  }
+
+  static file_info get_2(__int64 now, std::wstring path, std::wstring file) {
     WIN32_FILE_ATTRIBUTE_DATA data;
     if (!GetFileAttributesEx((path + _T("\\") + file).c_str(), GetFileExInfoStandard, reinterpret_cast<LPVOID>(&data))) {
@@ -468 +494 @@
       return ret;
     }
-    return file_info(data, path, file);
-  }
-  static file_info get_1(std::wstring path, std::wstring file) {
+    return file_info(now, data, path, file);
+  }
+  static file_info get_1(__int64 now, std::wstring path, std::wstring file) {
     HANDLE hFile = CreateFile((path + _T("\\") + file).c_str(), FILE_READ_ATTRIBUTES, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
     if (hFile == INVALID_HANDLE_VALUE) {
@@ -480 +506 @@
     GetFileInformationByHandle(hFile, &_info);
     CloseHandle(hFile);
-    return file_info(_info, path, file);
+    return file_info(now, _info, path, file);
   }
 
@@ -488 +514 @@
     , ullLastWriteTime(0)
     , ullSize(0)
+    , ullNow(0)
     , cached_version(false, _T("")) 
     , cached_count(false, 0)
   {}
-  file_info(const WIN32_FILE_ATTRIBUTE_DATA info, std::wstring path_, std::wstring filename_) 
+  file_info(__int64 now, const WIN32_FILE_ATTRIBUTE_DATA info, std::wstring path_, std::wstring filename_) 
     : path(path_)
     , filename(filename_)
@@ -498 +525 @@
     , ullLastWriteTime(0)
     , ullSize(0)
+    , ullNow(now)
     , cached_version(false, _T("")) 
     , cached_count(false, 0)
@@ -506 +534 @@
     ullLastWriteTime = ((info.ftLastWriteTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftLastWriteTime.dwLowDateTime);
   };
-  file_info(const BY_HANDLE_FILE_INFORMATION info, std::wstring path_, std::wstring filename_) 
+  file_info(__int64 now, const BY_HANDLE_FILE_INFORMATION info, std::wstring path_, std::wstring filename_) 
     : path(path_)
     , filename(filename_)
@@ -513 +541 @@
     , ullLastWriteTime(0)
     , ullSize(0)
+    , ullNow(now)
     , cached_version(false, _T("")) 
     , cached_count(false, 0)
@@ -521 +550 @@
     ullLastWriteTime = ((info.ftLastWriteTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftLastWriteTime.dwLowDateTime);
   };
-  file_info(const WIN32_FIND_DATA info, std::wstring path_, std::wstring filename_) 
+  file_info(__int64 now, const WIN32_FIND_DATA info, std::wstring path_, std::wstring filename_) 
     : path(path_)
     , filename(filename_)
@@ -528 +557 @@
     , ullLastWriteTime(0)
     , ullSize(0)
+    , ullNow(now)
     , cached_version(false, _T("")) 
     , cached_count(false, 0)
@@ -536 +566 @@
     ullLastWriteTime = ((info.ftLastWriteTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftLastWriteTime.dwLowDateTime);
   };
-  file_info(std::wstring path_, std::wstring filename_) 
+  file_info(__int64 now, std::wstring path_, std::wstring filename_) 
     : path(path_)
     , filename(filename_)
@@ -543 +573 @@
     , ullLastWriteTime(0)
     , ullSize(0)
+    , ullNow(now)
     , cached_version(false, _T("")) 
     , cached_count(false, 0)
@@ -575 +606 @@
     strEx::replace(syntax, _T("%access%"), strEx::format_filetime(ullLastAccessTime, DATE_FORMAT));
     strEx::replace(syntax, _T("%write%"), strEx::format_filetime(ullLastWriteTime, DATE_FORMAT));
+    strEx::replace(syntax, _T("%creation-raw%"), strEx::itos(ullCreationTime));
+    strEx::replace(syntax, _T("%access-raw%"), strEx::itos(ullLastAccessTime));
+    strEx::replace(syntax, _T("%write-raw%"), strEx::itos(ullLastWriteTime));
+    strEx::replace(syntax, _T("%now-raw%"), strEx::itos(ullNow));
 /*
     strEx::replace(syntax, _T("%creation-d%"), strEx::format_filetime(ullCreationTime, DATE_FORMAT));
@@ -692 +727 @@
 {
   file_info info;
-  bool error;
+  __int64 now_;
 //  std::wstring message;
-  find_first_file_info() : error(false) {}
+  find_first_file_info() : now_(0) {
+    FILETIME now;
+    GetSystemTimeAsFileTime(&now);
+    now_ = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
+  }
   result_type operator()(argument_type ffd) {
     if (is_directory(ffd.wfd.dwFileAttributes))
       return true;
 
-    file_info info = file_info::get(ffd);
+    file_info info = file_info::get(now_, ffd);
     if (!info.error.empty()) {
       setError(ffd.errors, info.error);
@@ -720 +759 @@
     */
   }
-  inline const bool hasError() const {
-    return error;
-  }
   inline void setError(error_reporter *errors, std::wstring msg) {
     if (errors != NULL)
       errors->report_error(msg);
-    error = true;
   }
 };
@@ -735 +770 @@
   bool bFilterAll;
   bool bFilterIn;
-  bool error;
   std::wstring message;
   std::wstring syntax;
@@ -741 +775 @@
   unsigned long long now;
   unsigned int hit_count;
-
-  file_filter_function() : hit_count(0), error(false), bFilterIn(true), bFilterAll(true) {}
+  __int64 now_;
+
+  file_filter_function() : now_(0), hit_count(0), bFilterIn(true), bFilterAll(true) {
+    FILETIME now;
+    GetSystemTimeAsFileTime(&now);
+    now_ = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
+  }
   result_type operator()(argument_type ffd) {
     if (is_directory(ffd.wfd.dwFileAttributes))
       return true;
 
-    file_info info = file_info::get(ffd);
+    file_info info = file_info::get(now, ffd);
     if (!info.error.empty()) {
       setError(ffd.errors, info.error);
@@ -792 +831 @@
     return true;
   }
-  inline const bool hasError() const {
-    return error;
-  }
   inline void setError(error_reporter *errors, std::wstring msg) {
     if (errors != NULL)
       errors->report_error(msg);
-    error = true;
   }
 };
@@ -815 +850 @@
   bool bFilterAll;
   bool bFilterIn;
-  bool error;
   bool debug_;
   std::wstring message;
   std::wstring syntax;
   //std::wstring alias;
-  unsigned long long now;
+  unsigned long long now_;
   unsigned int hit_count;
   unsigned int file_count;
-  std::wstring last_error;
-  unsigned int error_count;
-
-  file_filter_function_ex() : hit_count(0), file_count(0), error(false), debug_(false), bFilterIn(true), bFilterAll(true), error_count(0) {}
+
+  file_filter_function_ex() : hit_count(0), file_count(0), debug_(false), bFilterIn(true), bFilterAll(true), now_(0) {
+    FILETIME now;
+    GetSystemTimeAsFileTime(&now);
+    now_ = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
+  }
   result_type operator()(argument_type ffd) {
     if (is_directory(ffd.wfd.dwFileAttributes))
       return true;
 
-    file_info info = file_info::get(ffd);
+    file_info info = file_info::get(now_, ffd);
     if (!info.error.empty()) {
       setError(ffd.errors, info.error);
@@ -889 +925 @@
     return true;
   }
-  inline const bool hasError() const {
-    return error;
-  }
   inline void setError(error_reporter *errors, std::wstring msg) {
     if (errors != NULL)
       errors->report_error(msg);
-    last_error = msg;
-    error_count++;
-    error = true;
   }
 
@@ -941 +971 @@
   pattern_type splitpath = split_pattern(path);
   recursive_scan<find_first_file_info>(splitpath.first, splitpath.second, -1, -1, finder, &errors, debug);
-  if (finder.hasError()) {
-    message = _T("File not found (check log for details)");
-    return NSCAPI::returnUNKNOWN;
-  }
-  FILETIME now_;
-  GetSystemTimeAsFileTime(&now_);
-  unsigned long long now = ((now_.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now_.dwLowDateTime);
-  time_t value = (now-finder.info.ullLastWriteTime)/10000000;
+  if (errors.has_error()) {
+    if (show_errors_)
+      message = errors.get_error();
+    else
+      message = _T("Check contains error. Check log for details (or enable show_errors in nsc.ini)");
+    return NSCAPI::returnUNKNOWN;
+  }
+  time_t value = (finder.now_-finder.info.ullLastWriteTime)/10000000;
   message = strEx::itos(value/60) + _T("&") + strEx::format_time_delta(gmtime(&value), format);
   return NSCAPI::returnOK;
@@ -999 +1029 @@
     return NSCAPI::returnUNKNOWN;
   }
-  FILETIME now;
-  GetSystemTimeAsFileTime(&now);
-  finder.now = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
   finder.syntax = syntax;
   NSC_error errors;
@@ -1007 +1034 @@
     pattern_type path = split_pattern(*pit);
     recursive_scan<file_filter_function>(path.first, path.second, 0, max_dir_depth, finder, &errors, debug);
-    if (finder.hasError()) {
-      message = _T("File not found: ") + (*pit) + _T(" check log for details.");
+    if (errors.has_error()) {
+      if (show_errors_)
+        message = errors.get_error();
+      else
+        message = _T("Check contains error. Check log for details (or enable show_errors in nsc.ini)");
       return NSCAPI::returnUNKNOWN;
     }
   }
   message = finder.message;
-  if (finder.error)
-    return NSCAPI::returnUNKNOWN;
   if (!alias.empty())
     query.alias = alias;
@@ -1120 +1148 @@
     return NSCAPI::returnUNKNOWN;
   }
-  FILETIME now;
-  GetSystemTimeAsFileTime(&now);
   finder.debug_ = debug;
-  finder.now = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
   if (debug)
-    NSC_DEBUG_MSG_STD(_T("NOW: ") + strEx::format_filetime(finder.now));
+    NSC_DEBUG_MSG_STD(_T("NOW: ") + strEx::format_filetime(finder.now_));
   finder.syntax = syntax;
   NSC_error errors;
   for (std::list<std::wstring>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
     recursive_scan<file_filter_function_ex>(*pit, pattern, 0, max_dir_depth, finder, &errors, debug);
-    if (!ignoreError && finder.hasError()) {
-      message = _T("Error when scanning: ") + (*pit) + _T(" check log for details (") + strEx::itos(finder.error_count) + _T(": ") + finder.last_error + _T(")");
+    if (!ignoreError && errors.has_error()) {
+      if (show_errors_)
+        message = errors.get_error();
+      else
+        message = _T("Check contains error. Check log for details (or enable show_errors in nsc.ini)");
       return NSCAPI::returnUNKNOWN;
     }
@@ -1159 +1187 @@
       0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
     if (hFile == INVALID_HANDLE_VALUE) {
-      return file_container(file, _T("Could not open file: ") + file);
+      return file_container(now, file, _T("Could not open file: ") + file);
     }
     GetFileInformationByHandle(hFile, &_info);
     CloseHandle(hFile);
-    file_container info(_info, file);
-    info.ullNow = now;
+    file_container info(now, _info, file);
+    //info.ullNow = now;
     return info;
   }
 
 
-  file_container(const BY_HANDLE_FILE_INFORMATION info, std::wstring file) : file_info(info, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
-  file_container(std::wstring file, std::wstring error) : error_(error), file_info(file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
+  file_container(__int64 now, const BY_HANDLE_FILE_INFORMATION info, std::wstring file) : file_info(now, info, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
+  file_container(__int64 now, std::wstring file, std::wstring error) : error_(error), file_info(now, file_helpers::meta::get_path(file), file_helpers::meta::get_filename(file)) {}
 
   bool has_errors() {

branches/stable/modules/CheckDisk/CheckDisk.h

@@ -27 +27 @@
 class CheckDisk {
 private:
+  bool show_errors_;
 
 public:

branches/stable/modules/CheckEventLog/CheckEventLog-2005.vcproj

@@ -214 +214 @@
         MinimalRebuild="true"
         BasicRuntimeChecks="3"
-        RuntimeLibrary="3"
+        RuntimeLibrary="1"
         UsePrecompiledHeader="2"
         WarningLevel="3"
@@ -297 +297 @@
         MinimalRebuild="true"
         BasicRuntimeChecks="3"
-        RuntimeLibrary="3"
+        RuntimeLibrary="1"
         UsePrecompiledHeader="2"
         WarningLevel="3"

branches/stable/modules/CheckEventLog/CheckEventLog.cpp

@@ -23 +23 @@
 #include "CheckEventLog.h"
 #include <filter_framework.hpp>
+#include <boost/foreach.hpp>
 
 #include <strEx.h>
@@ -446 +447 @@
       timeWritten.hasFilter() || timeGenerated.hasFilter();
   }
-  std::wstring getValue() const {
-    if (eventSource.hasFilter())
-      return _T("event-source: ") + eventSource.getValue();
-    if (eventType.hasFilter())
-      return _T("event-type: ") + eventType.getValue();
-    if (eventSeverity.hasFilter())
-      return _T("severity: ") + eventSeverity.getValue();
-    if (eventID.hasFilter())
-      return _T("event-id: ") + eventID.getValue();
-    if (message.hasFilter())
-      return _T("message: ") + message.getValue();
-    if (timeWritten.hasFilter())
-      return _T("time-written: ") + timeWritten.getValue();
-    if (timeGenerated.hasFilter())
-      return _T("time-generated: ") + timeGenerated.getValue();
-    return _T("UNknown...");
+
+#define NSCP_EL_DEBUG(key) if (key.hasFilter()) strEx::append_list(str, std::wstring(_T( # key )) + _T(" ") + key.to_string(), _T(","));
+  std::wstring to_string() const {
+    std::wstring str;
+    NSCP_EL_DEBUG(eventSource);
+    NSCP_EL_DEBUG(eventType);
+    NSCP_EL_DEBUG(eventSeverity);
+    NSCP_EL_DEBUG(eventID);
+    NSCP_EL_DEBUG(message);
+    NSCP_EL_DEBUG(timeWritten);
+    NSCP_EL_DEBUG(timeGenerated);
+    return str;
   }
   bool matchFilter(const EventLogRecord &value) const {
+    bool ret = false;
     if ((eventSource.hasFilter())&&(eventSource.matchFilter(value.eventSource())))
-      return true;
+      ret = true;
+    else if (eventSource.hasFilter())
+      return false;
     else if ((eventType.hasFilter())&&(eventType.matchFilter(value.eventType())))
-      return true;
+      ret = true;
+    else if (eventType.hasFilter())
+      return false;
     else if ((eventSeverity.hasFilter())&&(eventSeverity.matchFilter(value.severity())))
-      return true;
+      ret = true;
+    else if (eventSeverity.hasFilter())
+      return false;
     else if ((eventID.hasFilter())&&(eventID.matchFilter(value.eventID()))) 
-      return true;
+      ret = true;
+    else if (eventID.hasFilter())
+      return false;
     else if ((message.hasFilter())&&(message.matchFilter(value.enumStrings())))
-      return true;
+      ret = true;
+    else if (message.hasFilter())
+      return false;
     else if ((timeWritten.hasFilter())&&(timeWritten.matchFilter(value.timeWritten())))
-      return true;
+      ret = true;
+    else if (timeWritten.hasFilter())
+      return false;
     else if ((timeGenerated.hasFilter())&&(timeGenerated.matchFilter(value.timeGenerated())))
-      return true;
-    return false;
+      ret = true;
+    else if (timeGenerated.hasFilter())
+      return false;
+    return ret;
   }
 };
@@ -484 +496 @@
 
 #define MAP_FILTER(value, obj, filtermode) \
-      else if (p__.first == value) { eventlog_filter filter; filter.obj = p__.second; filter_chain.push_back(filteritem_type(filtermode, filter)); }
+      else if (p__.first == value) { filter.obj = p__.second; if (bPush) { filter_chain.push_back(filteritem_type(filtermode, filter)); filter = eventlog_filter(); } }
+#define MAP_FILTER_LAST(value, obj) \
+      else if (p__.first == value) { filter_chain.front().second.obj = p__.second; }
 
 struct event_log_buffer {
@@ -532 +546 @@
   const int filter_compat = 3;
   event_log_buffer buffer(buffer_length_);
+  bool bPush = true;
+  bool bDebug = debug_;
+  eventlog_filter filter;
   /*
   try {
@@ -553 +570 @@
       MAP_OPTIONS_BOOL_EX(_T("filter"), bFilterIn, _T("in"), _T("out"))
       MAP_OPTIONS_BOOL_EX(_T("filter"), bFilterAll, _T("all"), _T("any"))
+      MAP_OPTIONS_BOOL_EX(_T("auto-push"), bPush, _T("true"), _T("false"))
+      MAP_OPTIONS_BOOL_EX(_T("debug"), bDebug, _T("true"), _T("false"))
       MAP_OPTIONS_STR(_T("syntax"), syntax)
       /*
@@ -587 +606 @@
       MAP_FILTER(_T("filter-message"), message, filter_minus)
 
+      MAP_FILTER_LAST(_T("append-filter-eventType"), eventType)
+      MAP_FILTER_LAST(_T("append-filter-severity"), eventSeverity)
+      MAP_FILTER_LAST(_T("append-filter-eventID"), eventID)
+      MAP_FILTER_LAST(_T("append-filter-eventSource"), eventSource)
+      MAP_FILTER_LAST(_T("append-filter-generated"), timeGenerated)
+      MAP_FILTER_LAST(_T("append-filter-written"), timeWritten)
+      MAP_FILTER_LAST(_T("append-filter-message"), message)
+
+
       MAP_OPTIONS_MISSING(message, _T("Unknown argument: "))
       MAP_OPTIONS_END()
@@ -609 +637 @@
   }
   bool buffer_error_reported = false;
-
+  if (bDebug) {
+    std::wstring str;
+    BOOST_FOREACH(filteritem_type item, filter_chain) {
+      if (item.first == filter_normal)
+        str += _T(". {");
+      else if (item.first == filter_plus)
+        str += _T("+ {");
+      else if (item.first == filter_minus)
+        str += _T("- {");
+      else 
+        str += _T("? {");
+
+      str += item.second.to_string() + _T(" }");
+    }
+    NSC_DEBUG_MSG_STD(_T("Filter: ") + str);
+  }
+
+  bDebug = false;
   for (std::list<std::wstring>::const_iterator cit2 = files.begin(); cit2 != files.end(); ++cit2) {
     std::wstring name = *cit2;
@@ -684 +729 @@
             if ((mode == filter_minus)&&(bTmpMatched)) {
               // a -<filter> hit so thrash item and bail out!
-              if (debug_)
-                NSC_DEBUG_MSG_STD(_T("Matched: - ") + (*cit3).second.getValue() + _T(" for: ") + record.render(bShowDescriptions, syntax));
+              if (bDebug)
+                NSC_DEBUG_MSG_STD(_T("Matched: - ") + (*cit3).second.to_string() + _T(" for: ") + record.render(bShowDescriptions, syntax));
               bMatch = false;
               break;
             } else if ((mode == filter_plus)&&(!bTmpMatched)) {
               // a +<filter> missed hit so thrash item and bail out!
-              if (debug_)
-                NSC_DEBUG_MSG_STD(_T("Matched: + ") + (*cit3).second.getValue() + _T(" for: ") + record.render(bShowDescriptions, syntax));
+              if (bDebug)
+                NSC_DEBUG_MSG_STD(_T("Matched: + ") + (*cit3).second.to_string() + _T(" for: ") + record.render(bShowDescriptions, syntax));
               bMatch = false;
               break;
             } else if (bTmpMatched) {
-              if (debug_)
-                NSC_DEBUG_MSG_STD(_T("Matched: . (contiunue): ") + (*cit3).second.getValue() + _T(" for: ") + record.render(bShowDescriptions, syntax));
+              if (bDebug)
+                NSC_DEBUG_MSG_STD(_T("Matched: . (contiunue): ") + (*cit3).second.to_string() + _T(" for: ") + record.render(bShowDescriptions, syntax));
               bMatch = true;
             }

branches/stable/modules/CheckWMI/Jamfile

@@ -5 +5 @@
   : requirements
   <find-static-library>Wbemuuid
+  <find-static-library>atls
   ;
 

branches/stable/modules/LUAScript/LUAScript-2005.vcproj

@@ -69 +69 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -153 +153 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -233 +233 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -315 +315 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -396 +396 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -478 +478 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -557 +557 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -636 +636 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -719 +719 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -803 +803 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -881 +881 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -960 +960 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="lua.lib"
+        AdditionalDependencies="liblua.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"

branches/stable/modules/NRPEClient/Jamfile

@@ -14 +14 @@
   ../../include/arrayBuffer.cpp
   ../../include/utils.cpp
+  ../../include/Socket.cpp
+  ../../include/sslSocket.cpp
+  /openssl//socket
 
   : # requirements
   <def-file>$(source).def
-  <source>/openssl//socket
   <runtime-link>static
   <source>/boost//regexp

branches/stable/modules/NRPEListener/Jamfile

@@ -15 +15 @@
   ../../include/b64/b64.c
   ../../include/utils.cpp
+  ../../include/Socket.cpp
+  ../../include/sslSocket.cpp
+  /openssl//socket
 
   : # requirements
   <def-file>$(source).def
-  <source>/openssl//socket
   <runtime-link>static
 

branches/stable/modules/NSCAAgent/NSCAAgent-2005.vcproj

@@ -69 +69 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -153 +153 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -233 +233 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -315 +315 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -396 +396 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -478 +478 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -559 +559 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -641 +641 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -725 +725 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -809 +809 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="2"
@@ -889 +889 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"
@@ -971 +971 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib Crypto++.lib"
+        AdditionalDependencies="ws2_32.lib libcryptopp.lib"
         OutputFile="$(OutDir)\$(ProjectName).dll"
         LinkIncremental="1"

branches/stable/modules/NSCAAgent/NSCAThread.cpp

@@ -87 +87 @@
   
   encryption_method_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_ENCRYPTION, NSCA_ENCRYPTION_DEFAULT);
-  password_ = strEx::wstring_to_string(NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_PASSWORD, NSCA_PASSWORD_DEFAULT));
+  std::wstring password = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+  if (!password.empty())
+    password = NSCModuleHelper::Decrypt(password);
+  if (password.empty())
+    password = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_PASSWORD, NSCA_PASSWORD_DEFAULT);
+  if (password.empty()) {
+    // read main password if no NSCA one is found
+    password = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+    if (!password.empty())
+      password = NSCModuleHelper::Decrypt(password);
+    if (password.empty())
+      password = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
+  }
+  password_ = strEx::wstring_to_string(password);
+
   cacheNscaHost_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_CACHE_HOST, NSCA_CACHE_HOST_DEFAULT) == 1;
   std::list<std::wstring> items = NSCModuleHelper::getSettingsSection(NSCA_CMD_SECTION_TITLE);

branches/stable/release-build.bat

@@ -6 +6 @@
 
 echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
-%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
+     %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
 if %ERRORLEVEL% == -1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log
 
 echo %jam% --toolset=msvc source-archive >> build.log
-%jam% --toolset=msvc source-archive
+     %jam% --toolset=msvc source-archive
 if %ERRORLEVEL% == -1 goto :error
 echo :: Result: %ERRORLEVEL% >> build.log

branches/stable/wix.jam

@@ -48 +48 @@
   local wix-location = [ MATCH "^--wix=(.*)" : [ modules.peek : ARGV ] ] ;
   if $(wix-location) {
-    prefix = $(wix-location)\\bin\\ ;
+# MIME FIX!!!   prefix = $(wix-location)\\bin\\ ;
+    prefix = $(wix-location)\\ ;
   } else {
     command = [ common.get-invocation-command wix : candle.exe : $(command) ] ;

branches/stable/x64-build.bat

@@ -22 +22 @@
 
 :build_hdrs
-echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
-%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
+echo %jam% --toolset=msvc-8.0 --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
+     %jam% --toolset=msvc-8.0 --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
 if %ERRORLEVEL% == -1 goto :error_one
 echo :: Result: %ERRORLEVEL% >> build.log
@@ -29 +29 @@
 
 :build_src
-echo %jam% --toolset=msvc source-archive >> build.log
-%jam% --toolset=msvc source-archive
+echo %jam% --toolset=msvc-8.0 source-archive >> build.log
+     %jam% --toolset=msvc-8.0 source-archive
 if %ERRORLEVEL% == -1 goto :error_one
 echo :: Result: %ERRORLEVEL% >> build.log

branches/stable/x86-build.bat

@@ -22 +22 @@
 
 :build_hdrs
-echo %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
-%jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
+echo %jam% --toolset=msvc-8.0 --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers >> build.log
+     %jam% --toolset=msvc --with-cryptopp=%CRYPTOPP_SOURCE% --with-cryptopp-target=%NSCP_INCLUDE%\cryptopp cryptopp-headers
 if %ERRORLEVEL% == -1 goto :error_one
 echo :: Result: %ERRORLEVEL% >> build.log
@@ -29 +29 @@
 
 :build_src
-echo %jam% --toolset=msvc source-archive >> build.log
-%jam% --toolset=msvc source-archive
+echo %jam% --toolset=msvc-8.0 source-archive >> build.log
+     %jam% --toolset=msvc-8.0 source-archive
 if %ERRORLEVEL% == -1 goto :error_one
 echo :: Result: %ERRORLEVEL% >> build.log

@@ -1 +1 @@
 Debug
 obj
+AutoBuild.h.bak

@@ -1 +1 @@
 bin.v2
+bin
+obj

@@ -2 +2 @@
 installer_dll.ncb
 installer_dll.vcproj.DESKTOP.mickem.user
+*.user