Revision: 1936
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1936&view=rev
Author: entrope
Date: 2010-01-07 02:55:33 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
If a server sends us a new, expired G-line, create it deactivated (fixes SF
#2840365).
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/ircd/gline.c
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-07 02:39:48 UTC (rev
1935)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-07 02:55:33 UTC (rev
1936)
@@ -1,5 +1,10 @@
2010-01-06 Michael Poole <[email protected]>
+ * ircd/gline.c (gline_add): If a forced G-line has already
+ expired, create it in a deactivated state.
+
+2010-01-06 Michael Poole <[email protected]>
+
* ircd/m_burst.c (ms_burst): Gracefully handle the case where a
server sends us a too-large oplevel. Forward oplevels whenever
they are in use, not just when the channel is +A.
Modified: ircu2/branches/u2_10_12_branch/ircd/gline.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/gline.c 2010-01-07 02:39:48 UTC (rev
1935)
+++ ircu2/branches/u2_10_12_branch/ircd/gline.c 2010-01-07 02:55:33 UTC (rev
1936)
@@ -503,6 +503,9 @@
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 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
