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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Enno Rehling 2017-08-09 19:41:20 +02:00
parent d80b782283 bbeac66250
commit b2a8fc8c75
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/autoseed.c
View File

@ -172,8 +172,7 @@ newfaction *read_newfactions(const char *filename)
sz += strlcat(password, itoa36(rng_int()), sizeof(password)); sz += strlcat(password, itoa36(rng_int()), sizeof(password));
} }
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
if (strcmp(f->email, email) == 0 && f->subscription if (strcmp(f->email, email) == 0 && f->age < MINAGE_MULTI) {
&& f->age < MINAGE_MULTI) {
log_warning("email %s already in use by %s", email, factionname(f)); log_warning("email %s already in use by %s", email, factionname(f));
break; break;
} }