external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Added database merge feature.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2019-02-15 14:50:23 -08:00
parent ce5232b69b
commit 38ac4bbbe9
4 changed files with 68 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshagent.js
View file

@ -425,7 +425,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
var adminUser = obj.parent.users['user/' + domain.id + '/' + obj.domain.orphanagentuser.toLowerCase()];
if ((adminUser != null) && (adminUser.siteadmin == 0xFFFFFFFF)) {
// Mesh name is hex instead of base64
var meshname = Buffer.from(obj.meshid, 'base64').toString('hex').substring(0, 18);
var meshname = obj.meshid.substring(0, 18);
// Create a new mesh for this device
var links = {};