MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 08:13:30 +00:00
Code Issues Releases Wiki Activity

Fix from Ylian, regarding Linux Transition Agent

Browse Source
This commit is contained in:
Bryan Roe
2019-01-11 16:18:09 -08:00
parent 2759cc799e
commit 989a500b6e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meshcore/agentcore.c
View File

@@ -3174,12 +3174,15 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".mshx")) == 0) if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".mshx")) == 0)
{ {
if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")) == 0) if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")) == 0)
{
if (importSettings(agentHost, "mesh_linumshx") == 0) // Do this because the old agent would generate this bad file name on linux.
{ {
// Let's check to see if an .msh was embedded into our binary // Let's check to see if an .msh was embedded into our binary
checkForEmbeddedMSH(agentHost); checkForEmbeddedMSH(agentHost);
importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")); importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh"));
} }
} }
}
#ifdef WIN32 #ifdef WIN32
// If running as a Windows service, set basic values to the registry, this allows other applications to know what the mesh agent is doing. // If running as a Windows service, set basic values to the registry, this allows other applications to know what the mesh agent is doing.