Revision: 1927
http://undernet-ircu.svn.sourceforge.net/undernet-ircu/?rev=1927&view=rev
Author: entrope
Date: 2010-01-03 20:43:17 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
Fix SF bug #2793176 by making sure check_loop_and_lh() returns non-1 when it
kills a server.
Modified Paths:
--------------
ircu2/branches/u2_10_12_branch/ChangeLog
ircu2/branches/u2_10_12_branch/ircd/m_server.c
Modified: ircu2/branches/u2_10_12_branch/ChangeLog
===================================================================
--- ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-03 19:42:24 UTC (rev
1926)
+++ ircu2/branches/u2_10_12_branch/ChangeLog 2010-01-03 20:43:17 UTC (rev
1927)
@@ -1,5 +1,11 @@
2010-01-03 Michael Poole <[email protected]>
+ * ircd/m_server.c (check_loop_and_lh): Never return 1 when we kill
+ another server. Update the squit message text for maxhops and hub
+ violations.
+
+2010-01-03 Michael Poole <[email protected]>
+
* ircd/Makefile.in (IRCD_SRC): Add m_xquery.c and m_xreply.c to
the build.
Modified: ircu2/branches/u2_10_12_branch/ircd/m_server.c
===================================================================
--- ircu2/branches/u2_10_12_branch/ircd/m_server.c 2010-01-03 19:42:24 UTC
(rev 1926)
+++ ircu2/branches/u2_10_12_branch/ircd/m_server.c 2010-01-03 20:43:17 UTC
(rev 1927)
@@ -407,14 +407,14 @@
if (active_lh_line == 1)
{
if (exit_client_msg(cptr, LHcptr, &me,
- "Leaf-only link %s <- %s, check L:",
+ "Maximum hops exceeded for %s at %s",
cli_name(cptr), host) == CPTR_KILLED)
return CPTR_KILLED;
}
else if (active_lh_line == 2)
{
if (exit_client_msg(cptr, LHcptr, &me,
- "Non-Hub link %s <- %s, check H:",
+ "%s is not allowed to hub for %s",
cli_name(cptr), host) == CPTR_KILLED)
return CPTR_KILLED;
}
@@ -424,11 +424,8 @@
if (exit_client(cptr, LHcptr, &me, "I'm a leaf, define HUB") ==
CPTR_KILLED)
return CPTR_KILLED;
}
- /*
- * Did we kill the incoming server off already ?
- */
- if (killed)
- return 0;
+ /* We just squit somebody, and it wasn't cptr. */
+ return 0;
}
return 1;
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
