diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chanserv.c | 2 | ||||
| -rw-r--r-- | src/nickserv.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index 28624a5be..2f22e6bc8 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1700,7 +1700,7 @@ void expire_chans() for (ci = chanlists[i]; ci; ci = next) { next = ci->next; if (!ci->c && now - ci->last_used >= CSExpire - && !(ci->flags & (CI_VERBOTEN | CI_NO_EXPIRE))) { + && !(ci->flags & (CI_VERBOTEN | CI_NO_EXPIRE | CI_SUSPENDED))) { send_event(EVENT_CHAN_EXPIRE, 1, ci->name); alog("Expiring channel %s (founder: %s)", ci->name, (ci->founder ? ci->founder->display : "(none)")); diff --git a/src/nickserv.c b/src/nickserv.c index fe2081d7f..04f1d962e 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -1145,7 +1145,8 @@ void expire_nicks() } if (NSExpire && now - na->last_seen >= NSExpire - && !(na->status & (NS_VERBOTEN | NS_NO_EXPIRE))) { + && !(na->status & (NS_VERBOTEN | NS_NO_EXPIRE)) + && !(na->nc->flags & (NI_SUSPENDED))) { alog("Expiring nickname %s (group: %s) (e-mail: %s)", na->nick, na->nc->display, (na->nc->email ? na->nc->email : "none")); |