Relayed device group fixes.

meshcentral.js

@@ -3500,7 +3500,7 @@ function mainStart() {
             if (config.domains[i].yubikey != null) { yubikey = true; }
             if (config.domains[i].auth == 'ldap') { ldap = true; }
             if (config.domains[i].mstsc == true) { mstsc = true; }
-            if (config.domains[i].ssh == true) { if (nodeVersion < 11) { config.domains[i].ssh = false; } else { ssh = true; } }
+            if (config.domains[i].ssh == true) { if (nodeVersion < 11) { config.domains[i].ssh = false; } ssh = true; }
             if ((typeof config.domains[i].authstrategies == 'object')) {
                 if (passport == null) { passport = ['passport']; }
                 if ((typeof config.domains[i].authstrategies.twitter == 'object') && (typeof config.domains[i].authstrategies.twitter.clientid == 'string') && (typeof config.domains[i].authstrategies.twitter.clientsecret == 'string') && (passport.indexOf('passport-twitter') == -1)) { passport.push('passport-twitter'); }

meshuser.js

@@ -2907,7 +2907,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         event.msg = ': ';
 
                         // If we are in WAN-only mode, host is not used
-                        if ((args.wanonly == true) && (command.host)) { delete command.host; }
+                        if ((args.wanonly == true) && (command.host) && (node.mtype != 3) && (node.mtype != 4)) { delete command.host; }
 
                         // Look for a change
                         if ((typeof command.icon == 'number') && (command.icon != node.icon)) { change = 1; node.icon = command.icon; changes.push('icon'); }
@@ -6674,7 +6674,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
         try { info.uptime = process.uptime(); } catch (ex) { }
         try { info.cpuUsage = process.cpuUsage(); } catch (ex) { }
         try { info.memoryUsage = process.memoryUsage(); } catch (ex) { }
-        try { info.warnings = parent.parent.getServerWarnings(); } catch (ex) { }
+        try {
+            info.warnings = parent.parent.getServerWarnings();
+            console.log(info.warnings);
+        } catch (ex) { console.log(ex); }
         try { info.allDevGroupManagers = parent.parent.config.settings.managealldevicegroups; } catch (ex) { }
         try { if (process.traceDeprecation == true) { info.traceDeprecation = true; } } catch (ex) { }
         cmdData.result = JSON.stringify(info, null, 4);

views/default-mobile.handlebars

@@ -3376,7 +3376,7 @@
                 if (node.rname != null) { x += addDeviceAttribute('<span>' + "Name" + '</span>', '<span>' + EscapeHtml(node.rname) + '</span>'); }
 
                 // Attribute: Host
-                if (((features & 1) == 0) && (node.mtype != 4)) { // If not WAN-only, local hostname is in use
+                if ((((features & 1) == 0) && (node.mtype != 4)) || (node.mtype == 3)) { // If not WAN-only, local hostname is in use
                     if ((meshrights & 4) != 0) {
                         if (node.host) {
                             x += addDeviceAttribute("Hostname", '<span onclick=showEditNodeValueDialog(1) style=cursor:pointer>' + EscapeHtml(node.host) + '</span>');

views/default.handlebars

@@ -6757,7 +6757,7 @@
                 if ((node.rname != null) && (node.name != node.rname)) { x += addDeviceAttribute('<span title="' + "The name of this computer as set in the operating system" + '">' + "OS Name" + '</span>', '<span title="' + "The name of this computer as set in the operating system" + '">' + EscapeHtml(node.rname) + '</span>'); }
 
                 // Attribute: Host
-                if (((features & 1) == 0) && (node.mtype != 4)) { // If not WAN-only, local hostname is in use
+                if ((((features & 1) == 0) && (node.mtype != 4)) || (node.mtype == 3)) { // If not WAN-only, local hostname is in use
                     x += addDeviceAttribute("Hostname", addLinkConditional('<span onclick=showEditNodeValueDialog(1) style=cursor:pointer>' + (node.host?EscapeHtml(node.host):('<i>' + "None" + '</i>')) + '</span>', 'showEditNodeValueDialog(1)', meshrights & 4));
                 }