diff --git a/meshuser.js b/meshuser.js index ee53a82e..771f1543 100644 --- a/meshuser.js +++ b/meshuser.js @@ -958,6 +958,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use { // Add many new user accounts if ((user.siteadmin & 2) == 0) break; + if ((domain.auth == 'sspi') || (domain.auth == 'ldap')) break; if (!Array.isArray(command.users)) break; var userCount = 0; for (var i in command.users) { diff --git a/package.json b/package.json index f59566e3..45df3298 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.4-i", + "version": "0.3.4-j", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index cf054515..f6a85625 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index c2c1363f..6177068c 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -302,7 +302,7 @@
- +
@@ -1044,6 +1044,9 @@ // Setup the user interface in the right mode userInterfaceSelectMenu(); + + // If SSPI or LDAP authentication not used, allow batch account creation. + QV('p4UserBatchCreate', (features & 0x00080000) == 0); } // Toggle the web page to full screen diff --git a/webserver.js b/webserver.js index e7e73754..b98004cd 100644 --- a/webserver.js +++ b/webserver.js @@ -2633,7 +2633,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { } // Setup middleware - obj.app.engine('handlebars', obj.exphbs({})); // defaultLayout: 'main' + obj.app.engine('handlebars', obj.exphbs({ defaultLayout: null })); // defaultLayout: 'main' obj.app.set('view engine', 'handlebars'); if (obj.args.tlsoffload) { obj.app.set('trust proxy', obj.args.tlsoffload); } // Reverse proxy should add the "X-Forwarded-*" headers obj.app.use(obj.bodyParser.urlencoded({ extended: false }));