Changeset da1c7e1 in nscp


Ignore:
Timestamp:
07/02/08 07:14:22 (5 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2, stable
Children:
846bbe4
Parents:
34e7428
Message:

rollup for 0.3.3

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • AutoBuild.h

    r34e7428 rda1c7e1  
    33// change the FALSE to TRUE for autoincrement of build number 
    44#define INCREMENT_VERSION TRUE 
    5 #define FILEVER        0,3,3,13 
    6 #define PRODUCTVER     0,3,3,13 
    7 #define STRFILEVER     _T("0.3.3.13") 
    8 #define STRPRODUCTVER  _T("0.3.3.13") 
    9 #define STRPRODUCTDATE  _T("2008-06-30") 
     5#define FILEVER        0,3,3,15 
     6#define PRODUCTVER     0,3,3,15 
     7#define STRFILEVER     _T("0.3.3.15") 
     8#define STRPRODUCTVER  _T("0.3.3.15") 
     9#define STRPRODUCTDATE  _T("2008-07-02") 
    1010#endif // AUTOBUILD_H 

  • NSClient++-2005.sln

    rdff5db9 rda1c7e1  
    77  EndProjectSection 
    88  ProjectSection(ProjectDependencies) = postProject 
     9    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A} 
     10    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
     11    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
     12    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
     13    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
     14    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
     15    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
     16    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 
     17    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
     18    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
     19    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
     20    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
     21    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
     22    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    923    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} 
    10     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} 
    11     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8} 
    12     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} 
    13     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} 
    14     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} 
    15     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} 
    16     {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751} 
    17     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} 
    18     {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE} 
    19     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} 
    20     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} 
    21     {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24} 
    22     {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B} 
    2324  EndProjectSection 
    2425EndProject 
    … …  
    164165  EndProjectSection 
    165166  ProjectSection(ProjectDependencies) = postProject 
     167    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
    166168    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560} 
    167     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D} 
    168169  EndProjectSection 
    169170EndProject 

  • changelog

    r34e7428 rda1c7e1  
    55 * Improved socket performance (would be nice if we could be used as a "hub") 
    66 * "The message is blocked by User Interface Privilege Isolation, Administrative applications that need to see it can allow it through by calling ChangeWindowMessageFilter after making sure the necessary security precautions are in place. " 
     7 
     82008-03-11 MickeM 
     9 ! 0.3.3 Released 
     10 
     112008-07-02 MickeM 
     12 + Fixed some issues (?) with the installer the w32 and x64 are now different components (GUIDs). 
    713 
    8142008-07-01 MickeM 

  • helpers/installer/Product.wxs

    re1ef872 rda1c7e1  
    1515  <?if "$(var.PlatForm)" = "x64"?> 
    1616    <?define PlatForm.x64 ?> 
     17    <?define Product.GUID = "2D1374D5-8026-4e58-8F2E-6A3C40444769" ?> 
     18    <?define Package.GUID = "4E50A0E0-AE48-4737-A6A7-07F3A9F94C29" ?> 
     19    <?define Postfix.GUID = "DD5862EE637C" ?> 
    1720  <?else?> 
    18     <?define PlatForm.Win32 ?> 
     21    <?define Product.GUID = "BD153740-D13B-4432-8D39-EE8D2F100B0A" ?> 
     22    <?define Package.GUID = "93CF1821-AB09-4c77-AA15-DD5862EE637B" ?> 
     23    <?define Postfix.GUID = "DD5862EE637B" ?> 
     24  <?define PlatForm.Win32 ?> 
    1925  <?endif?> 
    2026   
    … …  
    2935  <?endif?> 
    3036 
    31   <Product Id="2D1374D5-8026-4e58-8F2E-6A3C40444769" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.1.0" Manufacturer="MySolutions NORDIC"> 
    32     <Package Id="93CF1821-AB09-4c77-AA15-DD5862EE637B" Description="A simple windows monitor agent for (amongst others) nagios." 
     37  <Product Id="$(var.Product.GUID)" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.1.0" Manufacturer="MySolutions NORDIC"> 
     38    <Package Id="$(var.Package.GUID)" Description="A simple windows monitor agent for (amongst others) nagios." 
    3339             Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes"/> 
    3440    <?ifdef var.PlatForm.Win32?> 
    35       <Condition Message="x64 bit version not supported on Win32 bit platform (get Win32 bit version instead)">NOT VersionNT64</Condition> 
     41      <Condition Message="x64 bit version not supported (by installer) on Win32 bit platform (get Win32 bit version instead)">NOT VersionNT64</Condition> 
    3642    <?else?> 
    37       <Condition Message="Win32 bit version not supported on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition> 
     43      <Condition Message="Win32 bit version not supported (by installer) on x64 bit platform (get x64 bit version instead)">VersionNT64</Condition> 
    3844    <?endif?> 
    3945    <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"> 
    … …  
    4248      <Directory Id="$(var.ProgramFiles)"> 
    4349        <Directory Id="INSTALLLOCATION" Name="NSClient" LongName="NSClient++"> 
    44             <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-B91D05D3CBE7" Win64="$(var.Win64)"> 
     50            <Component Id="MainClient" Guid="F6636DB0-A0B9-4dd2-B74C-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    4551              <File Id="NSClientEXE" Name="nsclient.exe" LongName="nsclient++.exe" DiskId="1"  
    4652                    Source="$(var.Source)/nsclient++.exe" Vital="yes"> 
    … …  
    6167            </Component> 
    6268            <Directory Id="INSTALLLOCATION_MODS" Name="modules"> 
    63               <Component Id="NRPEListener" Guid="5A0246F8-5167-45db-B246-88F694C7CD7B" Win64="$(var.Win64)"> 
     69              <Component Id="NRPEListener" Guid="5A0246F8-5167-45db-B246-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    6470                <File Id="NRPEListenerDLL" Name="NRPELsnr.dll" LongName="NRPEListener.dll" DiskId="1" Source="$(var.Source)/modules/NRPEListener.dll" Vital="no" /> 
    6571                <File Id="NRPEClientDLL" Name="NRPEClnt.dll" LongName="NRPEClient.dll" DiskId="1" Source="$(var.Source)/modules/NRPEClient.dll" Vital="no" /> 
    6672              </Component> 
    67               <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-A6CF832E2A69" Win64="$(var.Win64)"> 
     73              <Component Id="NSCListener" Guid="6DAF8BB9-9A56-48f5-B2C5-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    6874                <File Id="NSCListenerDLL" Name="NSCLsnr.dll" LongName="NSClientListener.dll" DiskId="1" Source="$(var.Source)/modules/NSClientListener.dll" Vital="no" /> 
    6975              </Component> 
    70               <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-E750EB112CAA" Win64="$(var.Win64)"> 
     76              <Component Id="NSCA" Guid="8820A304-C596-4393-A72F-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    7177                <File Id="NSCAAgentDLL" Name="NSCAAgnt.dll" LongName="NSCAAgent.dll" DiskId="1" Source="$(var.Source)/modules/NSCAAgent.dll" Vital="no" /> 
    7278              </Component> 
    73               <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-5C36F3F3209B" Win64="$(var.Win64)"> 
     79              <Component Id="Plugins" Guid="9B490E67-5472-4266-96DC-$(var.Postfix.GUID)" Win64="$(var.Win64)"> 
    7480                <File Id="ModCheckEventLog.dll" Name="EvntLg.dll" LongName="CheckEventLog.dll" DiskId="1" Source="$(var.Source)/modules/CheckEventLog.dll" Vital="no" /> 
    7581                <File Id="ModCheckExternalScripts.dll" Name="ExtScr.dll" LongName="CheckExternalScripts.dll" DiskId="1" Source="$(var.Source)/modules/CheckExternalScripts.dll" Vital="no" /> 

  • include/EnumProcess.cpp

    rb7ed6ac rda1c7e1  
    237237  if (lpBuffer == NULL) 
    238238    throw EnumProcException(_T("Failed to allocate buffer")); 
    239   DWORD dwBytesRead; 
     239  SIZE_T dwBytesRead; 
    240240  if (!ReadProcessMemory( hProcess, mbi.BaseAddress, (LPVOID)lpBuffer, sysinfo.dwPageSize, &dwBytesRead)) { 
    241241    free(lpBuffer); 

  • include/config.h

    rdff5db9 rda1c7e1  
    2626 
    2727// Version 
    28 #define SZBETATAG _T(" RC ")  //_T(" ") // _T(" RC ")  _T(" BETA ")  
     28#define SZBETATAG _T(" ") // _T(" RC ")  _T(" BETA ")  
    2929#define SZVERSION STRPRODUCTVER SZBETATAG STRPRODUCTDATE 
    3030//FILEVER[0] 

  • include/nrpe/nrpepacket.hpp

    r5b9d247 rda1c7e1  
    117117      throw NRPEPacketException(_T("No buffer.")); 
    118118    if (length != getBufferLength()) 
    119       throw NRPEPacketException(_T("Invalid length.")); 
     119      throw NRPEPacketException(_T("Invalid length: ") + strEx::itos(length) + _T(" != ") + strEx::itos(getBufferLength())); 
    120120    const packet *p = reinterpret_cast<const packet*>(buffer); 
    121121    type_ = ntohs(p->packet_type); 

  • modules/CheckTaskSched/CheckTaskSched-2005.vcproj

    rdff5db9 rda1c7e1  
    635635      <Tool 
    636636        Name="VCLinkerTool" 
    637         AdditionalDependencies="Wbemuuid.lib" 
     637        AdditionalDependencies="Mstask.lib" 
    638638        LinkIncremental="1" 
    639639        AdditionalLibraryDirectories="" 

  • modules/CheckTaskSched/CheckTaskSched.cpp

    r367bf20 rda1c7e1  
    7676 
    7777NSCAPI::nagiosReturn CheckTaskSched::TaskSchedule(const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) { 
    78   typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericBounds<int, checkHolders::int_handler> > > WMIConatiner; 
     78  typedef checkHolders::CheckContainer<checkHolders::MaxMinBounds<checkHolders::NumericBounds<int, checkHolders::int_handler> > > WMIContainer; 
    7979 
    8080  NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK; 
    … …  
    9191  bool bDebug = false; 
    9292 
    93   WMIConatiner result_query; 
     93  WMIContainer result_query; 
    9494  try { 
    9595    MAP_OPTIONS_BEGIN(args) 

  • modules/CheckTaskSched/CheckTaskSched.h

    r367bf20 rda1c7e1  
    5959 
    6060private: 
    61   typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsDiscSize> PathConatiner; 
    62   typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSize> DriveConatiner; 
     61  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsDiscSize> PathContainer; 
     62  typedef checkHolders::CheckContainer<checkHolders::MaxMinPercentageBoundsDiskSize> DriveContainer; 
    6363}; 

  • modules/LUAScript/LUAScript.h

    r47b843a rda1c7e1  
    7777 
    7878private: 
    79   typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsDiscSize> PathConatiner; 
    80   typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSize> DriveConatiner; 
     79  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsDiscSize> PathContainer; 
     80  typedef checkHolders::CheckContainer<checkHolders::MaxMinPercentageBoundsDiskSize> DriveContainer; 
    8181}; 

  • modules/RemoteConfiguration/RemoteConfiguration.h

    r99e4d8f rda1c7e1  
    5858 
    5959private: 
    60   typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsDiscSize> PathConatiner; 
    61   typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSize> DriveConatiner; 
     60  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsDiscSize> PathContainer; 
     61  typedef checkHolders::CheckContainer<checkHolders::MaxMinPercentageBoundsDiskSize> DriveContainer; 
    6262}; 
Note: See TracChangeset for help on using the changeset viewer.