summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
837bdbb)
git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1936
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
+2010-01-06 Michael Poole <mdpoole@troilus.org>
+
+ * ircd/gline.c (gline_add): If a forced G-line has already
+ expired, create it in a deactivated state.
+
2010-01-06 Michael Poole <mdpoole@troilus.org>
* ircd/m_burst.c (ms_burst): Gracefully handle the case where a
2010-01-06 Michael Poole <mdpoole@troilus.org>
* ircd/m_burst.c (ms_burst): Gracefully handle the case where a
if (!IsServer(sptr) && MyConnect(sptr))
send_reply(sptr, ERR_BADEXPIRE, expire);
return 0;
if (!IsServer(sptr) && MyConnect(sptr))
send_reply(sptr, ERR_BADEXPIRE, expire);
return 0;
+ } else if (expire <= CurrentTime) {
+ /* This expired G-line was forced to be added, so mark it inactive. */
+ flags &= ~GLINE_ACTIVE;
}
if (!lifetime) /* no lifetime set, use expiration time */
}
if (!lifetime) /* no lifetime set, use expiration time */