diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/chanserv.c | 2 | ||||
| -rw-r--r-- | src/nickserv.c | 3 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 9 insertions, 3 deletions
@@ -7,6 +7,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006 04/20 F Fixed index of backtrace(). [#499] 04/29 F Added is_on_chan() check for fantasy kick commands. [#501] 05/13 F Fixed memleak in moduleGetConfigDirective(). [#504] +05/16 F Suspended nicks and chans won't expire from now on. [ #00] Anope Version 1.7.14 -------------------- 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")); diff --git a/version.log b/version.log index 3e2a27f2d..c57ebb0a3 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="14" VERSION_EXTRA="" -VERSION_BUILD="1030" +VERSION_BUILD="1032" # $Log$ # +# BUILD : 1.7.14 (1032) +# BUGS : +# NOTES : suspended nicks/chans won't expire +# # BUILD : 1.7.14 (1031) # BUGS : 504 # NOTES : fixed memleak, thx to trystan |