git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1927
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
+2010-01-03 Michael Poole <mdpoole@troilus.org>
+
+ * 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 <mdpoole@troilus.org>
* ircd/Makefile.in (IRCD_SRC): Add m_xquery.c and m_xreply.c to
2010-01-03 Michael Poole <mdpoole@troilus.org>
* ircd/Makefile.in (IRCD_SRC): Add m_xquery.c and m_xreply.c to
if (active_lh_line == 1)
{
if (exit_client_msg(cptr, LHcptr, &me,
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,
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;
}
cli_name(cptr), host) == CPTR_KILLED)
return CPTR_KILLED;
}
if (exit_client(cptr, LHcptr, &me, "I'm a leaf, define HUB") == CPTR_KILLED)
return CPTR_KILLED;
}
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;