Changeset c630d09 in nscp

Timestamp:

05/13/12 23:13:25 (13 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

1cc8566

Parents:

df109f9

Message:

• Take 2 on fixing the empty command parsing.

Files:

• changelog (modified) (1 diff)
• modules/CheckExternalScripts/commands.hpp (modified) (3 diffs)
• modules/Scheduler/schedules.hpp (modified) (3 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -4 +4 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-05-13 MickeM
+ * Take 2 on fixing the empty command parsing.
 
 2012-05-07 MickeM

modules/CheckExternalScripts/commands.hpp

@@ -120 +120 @@
     static void read_object(boost::shared_ptr<nscapi::settings_proxy> proxy, object_type &object) {
       object.set_command(object.value);
+      std::wstring alias;
       //if (object.alias == _T("default"))
       // Pupulate default template!
@@ -144 +145 @@
         _T("COMMAND"), _T("Command to execute"))
 
-        (_T("alias"), sh::wstring_key(&object.alias),
-        _T("ALIAS"), _T("The alias (service name) to report to server"))
+        (_T("alias"), sh::wstring_key(&alias),
+        _T("ALIAS"), _T("The alias (service name) to report to server"), true)
 
         (_T("parent"), nscapi::settings_helper::wstring_key(&object.parent, _T("default")),
@@ -166 +167 @@
       settings.register_all();
       settings.notify();
+      if (!alias.empty())
+        object.alias = alias;
 
       /*

modules/Scheduler/schedules.hpp

@@ -117 +117 @@
         object.channel = _T("NSCA");
       }
+      std::wstring alias;
 
       nscapi::settings_helper::settings_registry settings(proxy);
@@ -129 +130 @@
         _T("SCHEDULE COMMAND"), _T("Command to execute"), object.alias == _T("default"))
 
-        (_T("alias"), sh::wstring_key(&object.alias),
+        (_T("alias"), sh::wstring_key(&alias),
         _T("SCHEDULE ALIAS"), _T("The alias (service name) to report to server"), object.alias == _T("default"))
 
@@ -173 +174 @@
       settings.notify();
 
+      if (!alias.empty())
+        object.alias = alias;
       /*
       BOOST_FOREACH(const object_type::options_type::value_type &kvp, options) {

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,172
-#define STRPRODUCTVER  "0,4,0,172"
-#define STRPRODUCTDATE "2012-05-08"
+#define PRODUCTVER     0,4,0,173
+#define STRPRODUCTVER  "0,4,0,173"
+#define STRPRODUCTDATE "2012-05-13"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=172
-date=2012-05-08
+build=173
+date=2012-05-13