cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] Don't show the UID if a TS6 server sends a kick with 

an empty or no comment. Note that charybdis never sends
such kicks.
This commit is contained in:
jilles 2007-03-28 16:17:06 -07:00
parent 8d19a2b257
commit 0bba178826
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
jilles 2007/03/28 15:40:24 UTC (20070328-3307)
Log:
Merge old trunk r2081:
Don't say that services cannot be killed in
ERR_ISCHANSERVICE message (given when trying
to kick or deop them), as that's not the case.
Changes: Modified:
+1 -1 trunk/src/messages.tab (File Modified)
jilles 2007/03/28 15:30:56 UTC (20070328-3305) jilles 2007/03/28 15:30:56 UTC (20070328-3305)
Log: Log:
Merge old trunk r2059 Merge old trunk r2059

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070328-3305" #define SERNO "20070328-3307"

12
modules/core/m_kick.c
View File

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: m_kick.c 258 2005-09-21 23:57:17Z nenolod $ * $Id: m_kick.c 3317 2007-03-28 23:17:06Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -49,7 +49,7 @@ struct Message kick_msgtab = {
mapi_clist_av1 kick_clist[] = { &kick_msgtab, NULL }; mapi_clist_av1 kick_clist[] = { &kick_msgtab, NULL };
DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 258 $"); DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 3317 $");
/* /*
** m_kick ** m_kick
@ -74,10 +74,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
if(MyClient(source_p) && !IsFloodDone(source_p)) if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p); flood_endgrace(source_p);
comment = LOCAL_COPY((EmptyString(parv[3])) ? parv[2] : parv[3]);
if(strlen(comment) > (size_t) REASONLEN)
comment[REASONLEN] = '\0';
*buf = '\0'; *buf = '\0';
if((p = strchr(parv[1], ','))) if((p = strchr(parv[1], ',')))
*p = '\0'; *p = '\0';
@ -163,6 +159,10 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
return 0; return 0;
} }
comment = LOCAL_COPY((EmptyString(parv[3])) ? who->name : parv[3]);
if(strlen(comment) > (size_t) REASONLEN)
comment[REASONLEN] = '\0';
/* jdc /* jdc
* - In the case of a server kicking a user (i.e. CLEARCHAN), * - In the case of a server kicking a user (i.e. CLEARCHAN),
* the kick should show up as coming from the server which did * the kick should show up as coming from the server which did