MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

This commit is contained in:
Ylian Saint-Hilaire 2021-12-10 14:12:01 -08:00
parent cb2970f31e 3d449d53bb
commit bd915de7fc
2 changed files with 541 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meshcentral.js
View File

@ -829,7 +829,7 @@ function CreateMeshCentralServer(config, args) {
obj.db.Set(user, function () { console.log("Done."); process.exit(); return; });
} else {
// Hash the password and reset the account.
require('./pass').hash(obj.args.pass, user.salt, function (err, hash, tag) { if (err) { console.log("Unable to reset password: " + err); process.exit(); return; } user.hash = hash; obj.db.Set(user, function () { console.log("Done."); process.exit(); return; }); }, 0);
require('./pass').hash(String(obj.args.pass), user.salt, function (err, hash, tag) { if (err) { console.log("Unable to reset password: " + err); process.exit(); return; } user.hash = hash; obj.db.Set(user, function () { console.log("Done."); process.exit(); return; }); }, 0);
}
});
return;

1092
meshuser.js
View File

File diff suppressed because it is too large Load Diff