empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reject: Replace getrejects() by nat_accepts()

Browse source 
All callers of getrejects() also check whether the sender is a deity.
Factor out the common code into nat_accepts(), and drop getrejects().

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 11:39:05 +01:00
parent 5983fa2f6c
commit 9d153f547c
8 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/rea.c
View file

@ -107,8 +107,7 @@ rea(void)
if (res <= 0)
break;
if (*kind == 'a') {
if ((getnatp(tgm.tel_from)->nat_stat != STAT_GOD
&& (getrejects(tgm.tel_from, np) & REJ_ANNO))
if ((!nat_accepts(np, tgm.tel_from, REJ_ANNO))
|| tgm.tel_date < then) {
res = tel_read_body(telfp, mbox, &tgm, NULL, NULL);
if (res < 0)