MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-10 21:33:38 +00:00
Code Issues Releases Wiki Activity

1. Updated user-sessions.consoleUid() to not try to parse 'from'. It just returns the uid of any user listed in 'who'. This fixes Fedora, but should still work with all the other distros.

Browse Source 
2. Updated, so if it can't find an Xauthority, it propagates an error, asking if the user configured DM to use X. This makes it, so on something like Fedora, it pops up a more intuitive error, that the user can fix, rather than just a generic, XOpenDisplay() error.
This commit is contained in:
Bryan Roe
2019-01-30 23:17:39 -08:00
parent 60df8bbd56
commit 52ff7ba04c
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meshcore/agentcore.c
View File

@@ -1305,6 +1305,19 @@ duk_ret_t ILibDuktape_MeshAgent_getRemoteDesktop_DomainIPC_Sink(duk_context *ctx
}
#endif
#if defined(_LINKVM) && defined(_POSIX) && !defined(__APPLE__)
void ILibDuktape_MeshAgent_RemoteDesktop_SendError(RemoteDesktop_Ptrs* ptrs, char *msg)
{
int msgLen = strnlen_s(msg, 255);
char buffer[512];
((unsigned short*)buffer)[0] = (unsigned short)htons((unsigned short)MNG_ERROR); // Write the type
((unsigned short*)buffer)[1] = (unsigned short)htons((unsigned short)(msgLen + 4)); // Write the size
memcpy_s(buffer + 4, 512 - 4, msg, msgLen);
ILibDuktape_MeshAgent_RemoteDesktop_KVM_WriteSink(buffer, msgLen + 4, ptrs);
}
#endif
duk_ret_t ILibDuktape_MeshAgent_getRemoteDesktop(duk_context *ctx)
{
#ifndef _LINKVM
@@ -1415,6 +1428,12 @@ duk_ret_t ILibDuktape_MeshAgent_getRemoteDesktop(duk_context *ctx)
})();") == 0)
{
updateXAuth = (char*)duk_get_string(ctx, -1);
if (console_uid != 0 && updateXAuth == NULL)
{
ILibDuktape_MeshAgent_RemoteDesktop_SendError(ptrs, "Xauthority not found! Is you DM configured to use X?");
duk_pop(ctx);
return(1);
}
}
needPop = 1;
}