From 63aecfb960dbc12d2e459a8ba355a633a49ee71f Mon Sep 17 00:00:00 2001 From: jilles Date: Wed, 31 Jan 2007 15:57:18 -0800 Subject: [PATCH] [svn] Change spambot, flooder and jupe joiner notices from host to orighost. --- ChangeLog | 9 +++++++++ include/serno.h | 2 +- modules/core/m_join.c | 6 +++--- modules/core/m_message.c | 8 ++++---- src/channel.c | 6 +++--- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d357c3ee1..4fa3a80d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +jilles 2007/01/28 22:13:18 UTC (20070128-3169) + Log: + Add documentation for SASL client protocol, same as atheme doc/SASL. + + + Changes: Modified: + + - trunk/doc/sasl.txt (File Added) + + jilles 2007/01/26 18:52:11 UTC (20070126-3167) Log: Include real hostname in Closing Link message for unknown diff --git a/include/serno.h b/include/serno.h index f571462b4..6ac72d3d9 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070126-3167" +#define SERNO "20070128-3169" diff --git a/modules/core/m_join.c b/modules/core/m_join.c index de001cd8f..50a9171d5 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_join.c 3131 2007-01-21 15:36:31Z jilles $ + * $Id: m_join.c 3173 2007-01-31 23:57:18Z jilles $ */ #include "stdinc.h" @@ -62,7 +62,7 @@ mapi_hlist_av1 join_hlist[] = { { NULL, NULL }, }; -DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3131 $"); +DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3173 $"); static void do_join_0(struct Client *client_p, struct Client *source_p); static int check_channel_name_loc(struct Client *source_p, const char *name); @@ -175,7 +175,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_realops_snomask(SNO_SPY, L_NETWIDE, "User %s (%s@%s) is attempting to join locally juped channel %s (%s)", source_p->name, source_p->username, - source_p->host, name, aconf->passwd); + source_p->orighost, name, aconf->passwd); /* dont update tracking for jupe exempt users, these * are likely to be spamtrap leaves */ diff --git a/modules/core/m_message.c b/modules/core/m_message.c index b1e09a1fa..f05b914b1 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_message.c 1761 2006-07-27 19:27:49Z jilles $ + * $Id: m_message.c 3173 2007-01-31 23:57:18Z jilles $ */ #include "stdinc.h" @@ -76,7 +76,7 @@ struct Message notice_msgtab = { mapi_clist_av1 message_clist[] = { &privmsg_msgtab, ¬ice_msgtab, NULL }; -DECLARE_MODULE_AV1(message, modinit, moddeinit, message_clist, NULL, NULL, "$Revision: 1761 $"); +DECLARE_MODULE_AV1(message, modinit, moddeinit, message_clist, NULL, NULL, "$Revision: 3173 $"); struct entity { @@ -784,7 +784,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p sendto_realops_snomask(SNO_BOTS, L_ALL, "Possible Flooder %s[%s@%s] on %s target: %s", source_p->name, source_p->username, - source_p->host, + source_p->orighost, source_p->user->server, target_p->name); target_p->localClient->flood_noticed = 1; /* add a bit of penalty */ @@ -839,7 +839,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, sendto_realops_snomask(SNO_BOTS, L_ALL, "Possible Flooder %s[%s@%s] on %s target: %s", source_p->name, source_p->username, - source_p->host, + source_p->orighost, source_p->user->server, chptr->chname); chptr->flood_noticed = 1; diff --git a/src/channel.c b/src/channel.c index 51f554860..1888d9749 100644 --- a/src/channel.c +++ b/src/channel.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel.c 3131 2007-01-21 15:36:31Z jilles $ + * $Id: channel.c 3173 2007-01-31 23:57:18Z jilles $ */ #include "stdinc.h" @@ -922,12 +922,12 @@ check_spambot_warning(struct Client *source_p, const char *name) sendto_realops_snomask(SNO_BOTS, L_ALL, "User %s (%s@%s) trying to join %s is a possible spambot", source_p->name, - source_p->username, source_p->host, name); + source_p->username, source_p->orighost, name); else sendto_realops_snomask(SNO_BOTS, L_ALL, "User %s (%s@%s) is a possible spambot", source_p->name, - source_p->username, source_p->host); + source_p->username, source_p->orighost); source_p->localClient->oper_warn_count_down = OPER_SPAM_COUNTDOWN; } }