Module: check_mk
Branch: master
Commit: 4ac3e30aa477e06fec4303e7b8a9d56f13addb85
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ac3e30aa477e0…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Jul 13 16:08:09 2015 +0200
Revert "#2401 windows agent: changed executionpolicy for powershell scripts to
unrestricted"
This reverts commit 3b8f33efc80c067b5b071dcf857577d3f3492aeb.
---
.werks/2401 | 11 -----------
ChangeLog | 1 -
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent.cc | 2 +-
agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes
agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes
agents/windows/install_agent-64.exe | Bin 179048 -> 179044 bytes
agents/windows/install_agent.exe | Bin 160001 -> 160003 bytes
11 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/.werks/2401 b/.werks/2401
deleted file mode 100644
index bd23d03..0000000
--- a/.werks/2401
+++ /dev/null
@@ -1,11 +0,0 @@
-Title: windows agent: changed executionpolicy for powershell scripts to unrestricted
-Level: 1
-Component: checks
-Compatible: compat
-Version: 1.2.7i3
-Date: 1436773665
-Class: feature
-
-Powershell scripts were previously called with the execution policy
<i>RemoteSigned</i>
-which did not work properly on certain windows systems.
-
diff --git a/ChangeLog b/ChangeLog
index 9745555..28d0a2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,6 @@
* 2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks
* 1269 esx_vsphere_counters.diskio: Check now uses the default diskstat
implementation...
NOTE: Please refer to the migration notes!
- * 2401 windows agent: changed executionpolicy for powershell scripts to
unrestricted...
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
* 2316 FIX: windows agent: fix garbled output of cached agent plugins...
* 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 8f897c8..ca55a6c 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-202
+198
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 19646d0..666b0f4 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 256dcef..3ca66e0 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 7ff2878..1c2cd52 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -2783,7 +2783,7 @@ char *add_interpreter(char *path, char *newpath)
// 1.) The powershell interpreter needs to be in PATH
// 2.) The execution policy needs to allow the script execution
// -> Get-ExecutionPolicy / Set-ExecutionPolicy
- snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy Unrestricted
\"& \'%s\'\"", path);
+ snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned
\"& \'%s\'\"", path);
return newpath;
}
else if (!strcmp(path + strlen(path) - 3, ".pl")) {
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 5ab11c7..eedb2d9 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index ef72fa6..3db52a5 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 34c227c..0573dc3 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 849a609..7ef306c 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 9c19565..1c31b2d 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ