Changeset 65a2940 in nscp

Timestamp:

08/14/11 16:44:02 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

2c95d22

Parents:

39c73cd

Message:

2011-08-14 MickeM

• NRPEClient now works on linux
• Added "portable" settings map file to installer (so it will work with old installed versions)

Files:

• changelog (modified) (1 diff)
• helpers/installer-dlls/main_dll/installer_helper.hpp (modified) (10 diffs)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (8 diffs)
• helpers/installers/installer/Product.wxs (modified) (1 diff)
• helpers/settings_manager/settings_manager_impl.h (modified) (2 diffs)
• include/char_buffer.hpp (modified) (2 diffs)
• include/nrpe/client/socket.hpp (modified) (2 diffs)
• include/nscapi/macros.hpp (modified) (2 diffs)
• include/settings/settings_old.hpp (modified) (3 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (4 diffs)
• modules/NRPEClient/NRPEClient.cpp (modified) (1 diff)
• modules/NRPEClient/NRPEClient.h (modified) (1 diff)
• modules/PythonScript/PythonScript.h (modified) (1 diff)
• service/NSClient++.cpp (modified) (3 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -6 +6 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2011-08-14 MickeM
+ * NRPEClient now works on linux
+ * Added "portable" settings map file to installer (so it will work with old installed versions)
 
 2011-08-13 MickeM

helpers/installer-dlls/main_dll/installer_helper.hpp

@@ -35 +35 @@
       throw installer_exception(_T("Failed to get size for target path '") + path + _T("': ") + error::lookup::last_error());
     len++;
-    char_buffer buffer(len);
+    tchar_buffer buffer(len);
     if (MsiGetTargetPath(hInstall_ ,path.c_str(), buffer, &len) != ERROR_SUCCESS) {
       throw installer_exception(_T("Failed to get target path '") + path + _T("': ") + error::lookup::last_error());
@@ -62 +62 @@
       throw installer_exception(_T("Failed to get size for property '") + path + _T("': ") + error::lookup::last_error());
     len++;
-    char_buffer buffer(len);
+    tchar_buffer buffer(len);
     if (MsiGetProperty(hInstall_ ,path.c_str(), buffer, &len) != ERROR_SUCCESS) {
       throw installer_exception(_T("Failed to get property '") + path + _T("': ") + error::lookup::last_error());
@@ -69 +69 @@
     return value;
   }
-  char_buffer getProperyRAW(std::wstring path) {
+  tchar_buffer getProperyRAW(std::wstring path) {
     wchar_t emptyString[MAX_PATH];
     DWORD len = 0;
@@ -76 +76 @@
       throw installer_exception(_T("Failed to get size for property '") + path + _T("': ") + error::format::from_system(er));
     len+=2;
-    char_buffer buffer(len);
+    tchar_buffer buffer(len);
     if ((er = MsiGetProperty(hInstall_ ,path.c_str(), buffer, &len)) != ERROR_SUCCESS) {
       throw installer_exception(_T("Failed to get property '") + path + _T("': ") + error::format::from_system(er));
@@ -89 +89 @@
   }
   void setPropertyAndOld(std::wstring key, std::wstring value) {
+    logMessage(_T("Reading old value for ") + key + _T("=") + value);
     MsiSetProperty(hInstall_, key.c_str(), value.c_str());
     MsiSetProperty(hInstall_, (key+_T("_OLD")).c_str(), value.c_str());
@@ -247 +248 @@
     if (!hRec)
       throw installer_exception(_T("Invalid arguments!"));
-    char_buffer buffer;
+    tchar_buffer buffer;
 
     HRESULT hr = S_OK;
@@ -269 +270 @@
   }
 
+    /********************************************************************
+  WcaGetRecordString() - gets a string field out of a record
+  ********************************************************************/
+  std::wstring get_record_blob(__in MSIHANDLE hRec, __in UINT uiField)
+  {
+    if (!hRec)
+      throw installer_exception(_T("Invalid arguments!"));
+    char_buffer buffer;
+
+    HRESULT hr = S_OK;
+    UINT er;
+
+    unsigned int size = MsiRecordDataSize(hRec, uiField);
+    buffer.realloc(size+5);
+
+    er = ::MsiRecordReadStream(hRec, uiField, buffer, (DWORD*)&size);
+    if (er != ERROR_SUCCESS)
+    if (ERROR_MORE_DATA == er){
+      throw installer_exception(_T("get_record_string:: Failed to get length of string: ") + error::format::from_system(er));
+    }
+    std::string string = buffer;
+    return utf8::cvt<std::wstring>(string);
+  }
+
   /********************************************************************
   HideNulls() - internal helper function to escape [~] in formatted strings
   ********************************************************************/
-  void _hide_nulls(char_buffer wzData) {
+  void _hide_nulls(tchar_buffer wzData) {
     LPWSTR pwz = wzData;
     while(*pwz) {
@@ -289 +314 @@
   RevealNulls() - internal helper function to unescape !$! in formatted strings
   ********************************************************************/
-  void _reveal_nulls(char_buffer wzData) {
+  void _reveal_nulls(tchar_buffer wzData) {
     LPWSTR pwz = wzData;
     while(*pwz) {
@@ -340 +365 @@
 
     // get the format string
-    char_buffer tmp = get_record_string(hRec, uiField);
+    tchar_buffer tmp = get_record_string(hRec, uiField);
     std::wstring t = tmp;
     if (t.length() == 0)
@@ -360 +385 @@
       throw installer_exception(_T("get_record_formatted_string:: Failed to get length of string: ") + error::format::from_system(er));
     }
-    char_buffer buffer(++cch);
+    tchar_buffer buffer(++cch);
 
     er = ::MsiFormatRecordW(hInstall_, hRecFormat, buffer, (DWORD*)&cch);

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -16 +16 @@
 bool uninstall(msi_helper &h, std::wstring service_name);
 
-UINT SchedServiceMgmt(__in MSIHANDLE hInstall, msi_helper::WCA_TODO todoSched)
-{
-//  msi_helper h(hInstall, _T("SchedServiceInstall"));
-//  try {
-//    int cFirewallExceptions = 0;
-//    h.logMessage(_T("SchedServiceInstall: ") + strEx::itos(todoSched));
-//    // anything to do?
-//    if (!h.table_exists(L"Services")) {
-//      h.logMessage(_T("Services table doesn't exist, so there are no services to configure."));
-//      return ERROR_SUCCESS;
-//    }
-// 
-//    // query and loop through all the firewall exceptions
-//    PMSIHANDLE hView = h.open_execute_view(vcsServiceQuery);
-//    if (h.isNull(hView)) {
-//      h.logMessage(_T("Failed to query service view!"));
-//      return ERROR_INSTALL_FAILURE;
-//    }
-// 
-//    msi_helper::custom_action_data_w custom_data;
-//    PMSIHANDLE hRec = h.fetch_record(hView);
-//    while (hRec != NULL)
-//    {
-//      std::wstring shortname = h.get_record_formatted_string(hRec, feqShortName);
-//      std::wstring longname = h.get_record_formatted_string(hRec, feqLongName);
-//      std::wstring desc = h.get_record_formatted_string(hRec, feqDesc);
-//      std::wstring deps = h.get_record_formatted_string(hRec, feqDeps);
-//      std::wstring program = h.get_record_formatted_string(hRec, feqProgram);
-//      int attributes = h.get_record_integer(hRec, feqAttributes);
-//      std::wstring component = h.get_record_string(hRec, feqComponent);
-// 
-//      // figure out what we're doing for this exception, treating reinstall the same as install
-//      msi_helper::WCA_TODO todoComponent = h.get_component_todo(component);
-//      if ((msi_helper::WCA_TODO_REINSTALL == todoComponent ? msi_helper::WCA_TODO_INSTALL : todoComponent) != todoSched) {
-//        h.logMessage(_T("Component '") + component + _T("' action state (") + strEx::itos(todoComponent) + _T(") doesn't match request (") + strEx::itos(todoSched) + _T(")"));
-//        hRec = h.fetch_record(hView);
-//        continue;
-//      }
-//      h.logMessage(_T("Adding data to CA chunk... "));
-//      // action :: name :: remoteaddresses :: attributes :: target :: {port::protocol | path}
-//      ++cFirewallExceptions;
-//      custom_data.write_int(todoComponent);
-//      custom_data.write_string(shortname);
-//      custom_data.write_string(longname);
-//      custom_data.write_string(desc);
-//      custom_data.write_string(deps);
-//      custom_data.write_int(attributes);
-//      //custom_data.write_int(fetApplication);
-//      custom_data.write_string(program);
-//      h.logMessage(_T("Adding data to CA chunk... DONE"));
-//      h.logMessage(_T("CA chunk: ") + custom_data.to_string());
-//      hRec = h.fetch_record(hView);
-//    }
-//    // schedule ExecFirewallExceptions if there's anything to do
-//    if (custom_data.has_data()) {
-//      h.logMessage(_T("Scheduling (WixExecServiceInstall) firewall exception: ") + custom_data.to_string());
-//      if (msi_helper::WCA_TODO_INSTALL == todoSched) {
-//        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-//        if (FAILED(hr)) {
-//          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
-//          return hr;
-//        }
-//        hr = h.do_deferred_action(L"WixExecServiceInstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-//        if (FAILED(hr)) {
-//          h.errorMessage(_T("failed to schedule service install exceptions execution"));
-//          return hr;
-//        }
-//      }
-//      else
-//      {
-//        h.logMessage(_T("Scheduling (WixExecServiceUninstall) firewall exception: ") + custom_data.to_string());
-//        HRESULT hr = h.do_deferred_action(L"WixRollbackServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-//        if (FAILED(hr)) {
-//          h.errorMessage(_T("failed to schedule service install exceptions rollback"));
-//          return hr;
-//        }
-//        hr = h.do_deferred_action(L"WixExecServiceUninstall", custom_data, cFirewallExceptions * COST_SERVICE_INSTALL);
-//        if (FAILED(hr)) {
-//          h.errorMessage(_T("failed to schedule service install exceptions execution"));
-//          return hr;
-//        }
-//      }
-//    } else
-//      h.logMessage(_T("No services scheduled"));
-//  } catch (installer_exception e) {
-//    h.errorMessage(_T("Failed to install service: ") + e.what());
-//    return ERROR_INSTALL_FAILURE;
-//  } catch (...) {
-//    h.errorMessage(_T("Failed to install service: <UNKNOWN EXCEPTION>"));
-//    return ERROR_INSTALL_FAILURE;
-//  }
-  return ERROR_SUCCESS;
-
-}
-
+
+void copy_file(msi_helper &h, std::wstring source, std::wstring target) {
+  if (file_helpers::checks::exists(source)) {
+    h.logMessage(_T("Copying: ") + source + _T(" to ") + target);
+    if (!CopyFile(source.c_str(), target.c_str(), FALSE)) {
+      h.errorMessage(_T("Failed to copy file: ") + error::lookup::last_error());
+    }
+  } else {
+    h.logMessage(_T("Copying failed: ") + source + _T(" to ") + target + _T(" source was not found."));
+  }
+
+}
 
 class installer_logger : public settings::logger_interface {
@@ -146 +63 @@
   std::wstring basepath;
   installer_logger logger;
-
-  installer_settings_provider(msi_helper *h, std::wstring basepath) : h(h), logger(h), basepath(basepath) {}
+  std::wstring old_settings_map;
+
+  installer_settings_provider(msi_helper *h, std::wstring basepath, std::wstring old_settings_map) : h(h), logger(h), basepath(basepath), old_settings_map(old_settings_map) {}
 
   virtual std::wstring expand_path(std::wstring file) {
@@ -169 +87 @@
   std::list<std::wstring> get_debug() {
     return logger.get_debug();
+  }
+  std::wstring get_data(std::wstring key) {
+    if (key == _T("old_settings_map_data")) {
+      return old_settings_map;
+    }
+    return _T("");
   }
 };
@@ -188 +112 @@
 // CONF_OLD_FOUND=0   => Allow setting boot.ini
 
+
+std::wstring read_map_data(msi_helper &h) {
+  std::wstring ret;
+  PMSIHANDLE hView = h.open_execute_view(_T("SELECT Data FROM Binary WHERE Name='OldSettingsMap'"));
+  if (h.isNull(hView)) {
+    h.logMessage(_T("Failed to query service view!"));
+    return _T("");
+  }
+
+  PMSIHANDLE hRec = h.fetch_record(hView);
+  if (hRec != NULL) {
+    ret = h.get_record_blob(hRec, 1);
+    ::MsiCloseHandle(hRec);
+  }
+  ::MsiCloseHandle(hView);
+  return ret;
+}
+
 extern "C" UINT __stdcall ImportConfig(MSIHANDLE hInstall) {
   msi_helper h(hInstall, _T("ImportConfig"));
@@ -195 +137 @@
     std::wstring custom = h.getPropery(_T("CUSTOM_CONFIGURATION_FILE"));
     std::wstring allow = h.getPropery(_T("ALLOW_CONFIGURATION"));
+
+    std::wstring tmpPath = h.getTempPath();
+
+    std::wstring map_data = read_map_data(h);
+
     if (allow == _T("0")) {
       h.logMessage(_T("Configuration not allowed: ") + allow);
@@ -211 +158 @@
     }
 
-    installer_settings_provider provider(&h, target);
+    installer_settings_provider provider(&h, target, map_data);
     if (!settings_manager::init_settings(&provider, _T(""))) {
       h.logMessage(_T("Settings context had fatal errors"));
@@ -251 +198 @@
     }
 
-
     h.setProperty(_T("CONFIGURATION_TYPE"), settings_manager::get_settings()->get_context());
+    h.logMessage(_T("CONFIGURATION_TYPE=") + settings_manager::get_settings()->get_context());
+    h.logMessage(_T("CONFIGURATION_TYPE=") + settings_manager::get_settings()->get_info());
     h.setProperty(_T("CONF_CAN_CHANGE"), _T("1"));
     h.setProperty(_T("CONF_HAS_ERRORS"), _T("0"));
 
-    h.setPropertyAndOld(_T("ALLOWED_HOSTS"), settings_manager::get_settings()->get_string(_T("/settings/default/"), _T("allowed hosts"), _T("")));
-    h.setPropertyAndOld(_T("NSCLIENT_PWD"), settings_manager::get_settings()->get_string(_T("/settings/default/"), _T("password"), _T("")));
+    h.setPropertyAndOld(_T("ALLOWED_HOSTS"), settings_manager::get_settings()->get_string(_T("/settings/default"), _T("allowed hosts"), _T("")));
+    h.setPropertyAndOld(_T("NSCLIENT_PWD"), settings_manager::get_settings()->get_string(_T("/settings/default"), _T("password"), _T("")));
 
     std::wstring modpath = _T("/modules");
@@ -378 +326 @@
     int add_defaults = data.get_next_int();
 
-    installer_settings_provider provider(&h, target);
+    std::wstring map_data = read_map_data(h);
+
+    installer_settings_provider provider(&h, target, map_data);
     if (!settings_manager::init_settings(&provider, context)) {
       h.errorMessage(_T("Failed to boot settings: ") + provider.get_error());

helpers/installers/installer/Product.wxs

@@ -253 +253 @@
     <Icon Id="nscp.exe" SourceFile="$(var.Source)/nscp.exe" />
     <Icon Id="doc.ico" SourceFile="../../../resources/help.ico"/>
+    <Binary Id="OldSettingsMap" SourceFile="$(var.Source)/old-settings.map" />
   </Product>
 </Wix>

helpers/settings_manager/settings_manager_impl.h

@@ -11 +11 @@
     virtual void log_fatal_error(std::wstring error) = 0;
     virtual settings::logger_interface* create_logger() = 0;
+    virtual std::wstring get_data(std::wstring key) = 0;
   };
 
@@ -35 +36 @@
       std::wstring ret = buffer;
       delete [] buffer;
+      if (ret == def) {
+        std::wstring tmp = provider_->get_data(key);
+        if (!tmp.empty())
+          return tmp;
+        return def;
+      }
       return ret;
 #else

include/char_buffer.hpp

@@ -6 +6 @@
 //typedef buffer<TCHAR> char_buffer;
 
-class char_buffer : public buffer<TCHAR> {
+class tchar_buffer : public buffer<TCHAR> {
 public:
-  char_buffer(std::wstring str) : buffer<TCHAR>(str.length()+2) {
+  tchar_buffer(std::wstring str) : buffer<TCHAR>(str.length()+2) {
     wcsncpy(unsafe_get_buffer(), str.c_str(), str.length());
   }
-  char_buffer(unsigned int len) : buffer<TCHAR>(len) {}
-  char_buffer() : buffer<TCHAR>() {}
+  tchar_buffer(unsigned int len) : buffer<TCHAR>(len) {}
+  tchar_buffer() : buffer<TCHAR>() {}
   void zero() {
     if (length() > 1)
@@ -18 +18 @@
   }
 };
+
+class char_buffer : public buffer<char> {
+public:
+  char_buffer(std::string str) : buffer<char>(str.length()+2) {
+    strncpy(unsafe_get_buffer(), str.c_str(), str.length());
+  }
+  char_buffer(unsigned int len) : buffer<char>(len) {}
+  char_buffer() : buffer<char>() {}
+  void zero() {
+    if (length() > 1)
+      ZeroMemory(unsafe_get_buffer(), length());
+  }
+};
+

include/nrpe/client/socket.hpp

@@ -60 +60 @@
       std::vector<char> buf = packet.get_buffer();
       write_with_timeout(buf, timeout);
-      get_socket().shutdown(boost::asio::ip::tcp::socket::shutdown_send);
     }
     virtual nrpe::packet recv(const nrpe::packet &packet, boost::posix_time::seconds timeout) {
@@ -80 +79 @@
 
 #ifdef USE_SSL
-  class ssl_socket : public socket, public boost::noncopyable {
+  class ssl_socket : public socket {
   private:
     boost::shared_ptr<boost::asio::ssl::stream<tcp::socket> > ssl_socket_;

include/nscapi/macros.hpp

@@ -20 +20 @@
 
 #define NSC_WRAPPERS_CLI() \
-  extern "C" int NSCommandLineExec(const unsigned int,wchar_t**);
+  extern "C" int NSCommandLineExec(wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len);
 
 #define NSC_WRAPPERS_CHANNELS() \
@@ -210 +210 @@
 
 #define NSC_WRAPPERS_CLI_DEF(toObject) \
-  extern int NSCommandLineExec(const wchar_t* command,const char* request_buffer,const unsigned int request_len,char** response_buffer,unsigned int* response_len) { \
+  extern int NSCommandLineExec(wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len) { \
     try { \
     std::string request = std::string(request_buffer, request_len); \

include/settings/settings_old.hpp

@@ -61 +61 @@
         }
       }
+      void read_map_data(std::wstring data) {
+        strEx::splitList list = strEx::splitEx(data, _T("\n"));
+        BOOST_FOREACH(std::wstring l, list) {
+          parse_line(l);
+        }
+      }
       void parse_line(std::wstring line) {
+        strEx::replace(line, _T("\n"), _T(""));
+        strEx::replace(line, _T("\r"), _T(""));
         int pos = line.find('#');
         if (pos != -1)
           line = line.substr(0, pos);
-        pos = line.find_first_not_of(_T(" \t"));
+        pos = line.find_first_not_of(_T(" \t\n\r"));
         if (pos == -1)
           return;
@@ -108 +116 @@
         key_map::iterator it1 = keys_.find(new_key);
         if (it1 != keys_.end()) {
-          get_logger()->quick_debug(new_key.first + _T(".") + new_key.second + _T(" not found in alias list"));
+          get_logger()->quick_debug(new_key.first + _T(".") + new_key.second + _T(" found in alias list"));
           return (*it1).second;
         }
         path_map::iterator it2 = sections_.find(new_key.first);
-        if (it2 != sections_.end())
+        if (it2 != sections_.end()) {
           return settings_core::key_path_type((*it2).second, new_key.second);
+        }
         return new_key;
+      }
+      std::wstring status() {
+        return _T("Sections: ") + strEx::itos(sections_.size()) + _T(", ")
+          + _T("Keys: ") + strEx::itos(keys_.size())
+          ;
       }
 
@@ -155 +169 @@
     OLDSettings(settings::settings_core *core, std::wstring context) : settings::SettingsInterfaceImpl(core, context), map(core->get_logger()) {
       get_logger()->debug(__FILE__, __LINE__, _T("Loading OLD: ") + context + _T(" for ") + context);
-      map.read_map_file(core->find_file(_T("${exe-path}/old-settings.map"), _T("old-settings.map")));
+      std::wstring mapfile = core->get_boot_string(_T("settings"), _T("old_settings_map_file"), _T("old-settings.map"));
+      std::wstring file = core->find_file(_T("${exe-path}/") + mapfile, mapfile);
+      bool readmap = false;
+      if (file_helpers::checks::exists(file)) {
+        readmap = true;
+        map.read_map_file(file);
+      }
+      std::wstring mapdata = core->get_boot_string(_T("settings"), _T("old_settings_map_data"), _T(""));
+      if (!mapdata.empty()) {
+        readmap = true;
+        map.read_map_data(mapdata);
+      }
+      if (!readmap) {
+        core->get_logger()->err(__FILE__, __LINE__,_T("Failed to read map file: ") + mapfile);
+      }
 
       string_list list = get_keys(_T("/includes"));

modules/CheckDisk/CheckDisk.cpp

@@ -131 +131 @@
     if (ptrFindFirstVolumeW == NULL)
       return INVALID_HANDLE_VALUE;
-    char_buffer  buffer(1024);
+    tchar_buffer  buffer(1024);
     HANDLE h = ptrFindFirstVolumeW(buffer.unsafe_get_buffer(), buffer.length());
     if (h != INVALID_HANDLE_VALUE)
@@ -140 +140 @@
     if (ptrFindFirstVolumeW == NULL || hVolume == INVALID_HANDLE_VALUE)
       return FALSE;
-    char_buffer  buffer(1024);
+    tchar_buffer  buffer(1024);
     BOOL r = ptrFindNextVolumeW(hVolume, buffer.unsafe_get_buffer(), buffer.length());
     if (r)
@@ -148 +148 @@
 
   void getVolumeInformation(std::wstring volume, std::wstring &name) {
-    char_buffer volumeName(1024);
-    char_buffer fileSysName(1024);
+    tchar_buffer volumeName(1024);
+    tchar_buffer fileSysName(1024);
     DWORD maximumComponentLength, fileSystemFlags;
 
@@ -162 +162 @@
 
   bool GetVolumeNameForVolumeMountPoint(std::wstring volumeMountPoint, std::wstring &volumeName) {
-    char_buffer buffer(1024);
+    tchar_buffer buffer(1024);
     if (ptrGetVolumeNameForVolumeMountPointW(volumeMountPoint.c_str(), buffer.unsafe_get_buffer(), buffer.length())) {
       volumeName = buffer;

modules/NRPEClient/NRPEClient.cpp

@@ -239 +239 @@
 
 int NRPEClient::commandLineExec(const std::wstring &command, std::vector<std::wstring> &arguments, std::wstring &result) {
+  NSC_DEBUG_MSG_STD(_T("===> ") + command);
   if (command != _T("query") && command != _T("help"))
     return NSCAPI::returnUNKNOWN;

modules/NRPEClient/NRPEClient.h

@@ -21 +21 @@
 
 NSC_WRAPPERS_MAIN();
+NSC_WRAPPERS_CLI();
+
+
 #include <map>
 #include <nrpe/packet.hpp>

modules/PythonScript/PythonScript.h

@@ -20 +20 @@
 ***************************************************************************/
 NSC_WRAPPERS_MAIN();
+NSC_WRAPPERS_CLI();
+
 #include <config.h>
 #include <strEx.h>

service/NSClient++.cpp

@@ -516 +516 @@
     return new settings_logger();
   }
+  std::wstring get_data(std::wstring key) {
+    // TODO
+    return _T("");
+  }
 };
 
@@ -865 +869 @@
   if (!found && !module.empty()) {
     try {
-      //boost::filesystem::wpath root = ;
       boost::filesystem::wpath file = NSCPlugin::get_filename(getBasePath() / boost::filesystem::wpath(_T("modules")), module);
       if (boost::filesystem::is_regular(file)) {
@@ -1359 +1362 @@
 }
 
-
 std::wstring NSClientT::expand_path(std::wstring file) {
   strEx::replace(file, _T("${certificate-path}"), _T("${shared-path}/security"));

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,83
-#define STRPRODUCTVER  "0,4,0,83"
-#define STRPRODUCTDATE "2011-08-07"
+#define PRODUCTVER     0,4,0,84
+#define STRPRODUCTVER  "0,4,0,84"
+#define STRPRODUCTDATE "2011-08-14"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=83
-date=2011-08-07
+build=84
+date=2011-08-14