Merge branch 'master' of https://github.com/Ylianst/MeshCentral into master

This commit is contained in:
Bryan Roe 2021-08-16 23:51:03 -07:00
commit 73459a311f
2 changed files with 2 additions and 2 deletions

View File

@ -1916,7 +1916,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
// No match, update the agent.
if (args.agentupdatesystem === 2) return 2; // If set, force a meshcore update.
//if (agentExeInfo.id == 3) return 2; // Due to a bug in Windows 7 SP1 environement variable exec, we always update 32bit Windows agent using MeshCore for now. Upcoming agent will have a fix for this.
if (agentExeInfo.id == 3) return 2; // Due to a bug in Windows 7 SP1 environement variable exec, we always update 32bit Windows agent using MeshCore for now. Upcoming agent will have a fix for this.
// NOTE: Windows agents with no commit dates may have bad native update system, so use meshcore system instead.
// NOTE: Windows agents with commit date prior to 1612740413000 did not kill all "meshagent.exe" processes and update could fail as a result executable being locked, meshcore system will do this.
if (((obj.AgentCommitDate == null) || (obj.AgentCommitDate < 1612740413000)) && ((agentExeInfo.id == 3) || (agentExeInfo.id == 4))) return 2; // For older Windows agents, use the meshcore update technique.

View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "0.9.4",
"version": "0.9.5",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",