Updated Windows Agents with cert regen on reintall.

2024-12-24 22:25:52 -05:00 · 2019-02-15 15:11:52 -08:00 · 2019-02-15 15:11:52 -08:00 · b7df070bd2
commit b7df070bd2
parent 45a50db52c
7 changed files with 6 additions and 4 deletions
--- a/agents/MeshCmd-signed.exe
+++ b/agents/MeshCmd-signed.exe
--- a/agents/MeshCmd64-signed.exe
+++ b/agents/MeshCmd64-signed.exe
--- a/agents/MeshService-signed.exe
+++ b/agents/MeshService-signed.exe
--- a/agents/MeshService.exe
+++ b/agents/MeshService.exe
--- a/agents/MeshService64-signed.exe
+++ b/agents/MeshService64-signed.exe
--- a/agents/MeshService64.exe
+++ b/agents/MeshService64.exe
--- a/meshcentral.js
+++ b/meshcentral.js
@ -393,12 +393,14 @@ function CreateMeshCentralServer(config, args) {
                                var existingUser = users[newobj._id];
                                if (existingUser) {
                                    // Merge the links
+                                    if (typeof newobj.links == 'object') {
                                        for (var j in newobj.links) {
                                            if ((existingUser.links == null) || (existingUser.links[j] == null)) {
                                                if (existingUser.links == null) { existingUser.links = {}; }
                                                existingUser.links[j] = newobj.links[j];
                                            }
                                        }
+                                    }
                                    if (existingUser.name == 'admin') { existingUser.links = {}; }
                                    objectToAdd.push(existingUser); // Add this user
                                } else {