forked from github/server
commit
5b342f9b11
|
@ -163,8 +163,9 @@ newfaction *read_newfactions(const char *filename)
|
|||
if (email[0] == '#') {
|
||||
continue;
|
||||
}
|
||||
if (email[0] == '\0')
|
||||
if (email[0] == '\0') {
|
||||
break;
|
||||
}
|
||||
if (password[0] == '\0') {
|
||||
size_t sz;
|
||||
sz = strlcpy(password, itoa36(rng_int()), sizeof(password));
|
||||
|
@ -172,17 +173,22 @@ newfaction *read_newfactions(const char *filename)
|
|||
}
|
||||
for (f = factions; f; f = f->next) {
|
||||
if (strcmp(f->email, email) == 0 && f->subscription
|
||||
&& f->age < MINAGE_MULTI)
|
||||
&& f->age < MINAGE_MULTI) {
|
||||
log_warning("email %s already in use by %s", email, factionname(f));
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (f && f->units)
|
||||
continue; /* skip the ones we've already got */
|
||||
for (nf = newfactions; nf; nf = nf->next) {
|
||||
if (strcmp(nf->email, email) == 0)
|
||||
if (strcmp(nf->email, email) == 0) {
|
||||
log_warning("duplicate new faction %s", email);
|
||||
break;
|
||||
}
|
||||
if (nf)
|
||||
}
|
||||
if (nf) {
|
||||
continue;
|
||||
}
|
||||
nf = calloc(sizeof(newfaction), 1);
|
||||
if (set_email(&nf->email, email) != 0) {
|
||||
log_error("Invalid email address for subscription %s: %s\n", itoa36(subscription), email);
|
||||
|
|
Loading…
Reference in New Issue