Fix wrong nscp path w/ command_endpoint runtime macros

Do not allow to override the nscp path by runtime macros.
This causes the (linux) master to send just "." as $nscp_path$
and the windows client ignores the local global constant NscpPath
being overridden by the master.

Only happens with command_endpoints where runtime macros are passed
from the master to the clients.

fixes #9456

diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index a2bf939d11d97949cb14076f6edfe133b1a939e5..8ed242c273ecc0bbcae76e321a21294abfd4914c 100644 (file)
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -1051,7 +1051,6 @@ Custom attributes passed as [command parameters](3-monitoring-basics.md#command-
 
 Name            | Description
 ----------------|--------------
-nscp_path       | **Optional.** Can be used to override the NSClient++ on a per-command basis. Defaults to NscpPath.
 nscp_log_level  | **Optional.** The log level. Defaults to "critical".
 nscp_load_all   | **Optional.** Whether to load all modules. Defaults to true.
 nscp_boot       | **Optional.** Whether to use the --boot option. Defaults to true.

diff --git a/itl/command-nscp-local.conf b/itl/command-nscp-local.conf
index 9f1a3f5b2dca0e19f3fef560d99238b2b5d7a4d8..2ff5ff6e111a0c0025e1ed4a2f82519fe7c84db7 100644 (file)
--- a/itl/command-nscp-local.conf
+++ b/itl/command-nscp-local.conf
@@ -24,7 +24,7 @@ if (!globals.contains("NscpPath")) {
 object CheckCommand "nscp-local" {
        import  "plugin-check-command"
 
-       command = [ "$nscp_path$\\nscp.exe", "client" ]
+       command = [ NscpPath + "\\nscp.exe", "client" ]
 
        arguments = {
                "--log" = "$nscp_log_level$"
@@ -39,7 +39,6 @@ object CheckCommand "nscp-local" {
                "-a" = "$nscp_arguments$"
        }
 
-       vars.nscp_path = {{ NscpPath }}
        vars.nscp_log_level = "critical"
        vars.nscp_load_all = true
        vars.nscp_boot = true