Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2020-03-02 21:37:54 +01:00
parent b8205893d2 eb273422f4
commit bea657b128
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/orderfile.c
View File

@ -56,20 +56,22 @@ typedef struct parser_state {
static void handle_faction(void *userData, int no, const char *password) { static void handle_faction(void *userData, int no, const char *password) {
parser_state *state = (parser_state *)userData; parser_state *state = (parser_state *)userData;
faction * f = state->f = findfaction(no); faction * f = findfaction(no);
if (!f) { if (!f) {
log_debug("orders for unknown faction %s", itoa36(no)); log_debug("orders for unknown faction %s", itoa36(no));
} }
else { else {
state->u = NULL;
state->next_order = NULL;
state->f = NULL;
if (checkpasswd(f, password)) { if (checkpasswd(f, password)) {
state->f = f;
f->lastorders = turn; f->lastorders = turn;
} }
else { else {
log_debug("invalid password for faction %s", itoa36(no)); log_debug("invalid password for faction %s", itoa36(no));
ADDMSG(&f->msgs, msg_message("wrongpasswd", "password", password)); ADDMSG(&f->msgs, msg_message("wrongpasswd", "password", password));
} }
state->u = NULL;
state->next_order = NULL;
} }
} }