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

Merge branch 'develop' of github.com:ennorehling/eressea into develop

This commit is contained in:
Enno Rehling 2019-04-26 06:22:02 +02:00
parent 692cdcea13 7e9b9330a3
commit 71090d0091
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process/accept-orders.py
View File

@ -54,7 +54,7 @@ hostname = gethostname()
orderbase = "orders.dir" orderbase = "orders.dir"
sendmail = True sendmail = True
# maximum number of reports per sender: # maximum number of reports per sender:
maxfiles = 20 maxfiles = 30
# write headers to file? # write headers to file?
writeheaders = True writeheaders = True
# reject all html email? # reject all html email?

4
src/gamedb.c
View File

@ -17,10 +17,12 @@ static int generate_factions(void *data, db_faction *results, int nresults)
faction **iter = (faction **)data; faction **iter = (faction **)data;
for (i = 0; *iter && i != nresults; ++i) { for (i = 0; *iter && i != nresults; ++i) {
faction *f = *iter; faction *f = *iter;
const char *pwhash;
results[i].p_uid = &f->uid; results[i].p_uid = &f->uid;
results[i].no = f->no; results[i].no = f->no;
results[i].email = faction_getemail(f); results[i].email = faction_getemail(f);
str_strlcpy(results[i].pwhash, faction_getpassword(f), sizeof(results[i].pwhash)); pwhash = faction_getpassword(f);
str_strlcpy(results[i].pwhash, pwhash ? pwhash : "", sizeof(results[i].pwhash));
*iter = f->next; *iter = f->next;
} }
return i; return i;