From a5266482304ef471986a8ba4df72692b41429dc9 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 17 Mar 2020 12:33:25 +1000 Subject: Only try to load users Lua file on login. --- src/sledjchisl/sledjchisl.c | 55 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 609fefa..68cd321 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c @@ -3493,33 +3493,6 @@ static int validateName(reqData *Rd, qhashtbl_t *data) if (s) {s--; *s = '\0'; s++;} free(where); - if (0 != rt) - { - bitch(Rd, "Login failed.", "Could not read user Lua file."); - ret += rt; - } - else - { - Rd->database->putstr(Rd->database, "UserAccounts.FirstName", name); - Rd->database->putstr(Rd->database, "UserAccounts.LastName", s); - Rd->database->putstr(Rd->database, "UserAccounts.Email", getStrH(tnm, "email")); - Rd->database->putstr(Rd->database, "UserAccounts.Created", getStrH(tnm, "created")); - Rd->database->putstr(Rd->database, "UserAccounts.PrincipleID", getStrH(tnm, "UUID")); - Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", getStrH(tnm, "level")); - Rd->database->putstr(Rd->database, "UserAccounts.UserFlags", getStrH(tnm, "flags")); - Rd->database->putstr(Rd->database, "UserAccounts.UserTitle", getStrH(tnm, "title")); - Rd->database->putstr(Rd->database, "UserAccounts.active", getStrH(tnm, "active")); - Rd->database->putstr(Rd->database, "auth.passwordSalt", getStrH(tnm, "passwordSalt")); - Rd->database->putstr(Rd->database, "auth.passwordHash", getStrH(tnm, "passwordHash")); - - Rd->stuff->putstr(Rd->stuff, "UUID", xstrdup(getStrH(Rd->database, "UserAccounts.PrincipalID"))); - Rd->stuff->putstr(Rd->stuff, "level", xstrdup(getStrH(Rd->database, "UserAccounts.Userlevel"))); - if (s) {s--; *s = ' '; s++;} - Rd->stuff->putstr(Rd->stuff, "name", xstrdup(name)); - if (s) {s--; *s = '\0'; s++;} - } - - static dbRequest *acnts = NULL; if (NULL == acnts) { @@ -3564,6 +3537,34 @@ if (rt) } } } +else +{ +// if (0 != rt) + { + } +// else + { + Rd->database->putstr(Rd->database, "UserAccounts.FirstName", name); + Rd->database->putstr(Rd->database, "UserAccounts.LastName", s); + Rd->database->putstr(Rd->database, "UserAccounts.Email", getStrH(tnm, "email")); + Rd->database->putstr(Rd->database, "UserAccounts.Created", getStrH(tnm, "created")); + Rd->database->putstr(Rd->database, "UserAccounts.PrincipleID", getStrH(tnm, "UUID")); + Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", getStrH(tnm, "level")); + Rd->database->putstr(Rd->database, "UserAccounts.UserFlags", getStrH(tnm, "flags")); + Rd->database->putstr(Rd->database, "UserAccounts.UserTitle", getStrH(tnm, "title")); + Rd->database->putstr(Rd->database, "UserAccounts.active", getStrH(tnm, "active")); + Rd->database->putstr(Rd->database, "auth.passwordSalt", getStrH(tnm, "passwordSalt")); + Rd->database->putstr(Rd->database, "auth.passwordHash", getStrH(tnm, "passwordHash")); + + Rd->stuff->putstr(Rd->stuff, "UUID", xstrdup(getStrH(Rd->database, "UserAccounts.PrincipalID"))); + Rd->stuff->putstr(Rd->stuff, "level", xstrdup(getStrH(Rd->database, "UserAccounts.Userlevel"))); + if (s) {s--; *s = ' '; s++;} + Rd->stuff->putstr(Rd->stuff, "name", xstrdup(name)); + if (s) {s--; *s = '\0'; s++;} + } + + +} } else if (strcmp("create", Rd->doit) == 0) { -- cgit v1.1