ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/branches/8.2.x/modules/core/m_nick.c

Comparing ircd-hybrid/branches/8.2.x/modules/core/m_nick.c (file contents):
Revision 4820 by michael, Sat Nov 1 16:50:43 2014 UTC vs.
Revision 4963 by michael, Mon Dec 1 13:08:44 2014 UTC

#	Line 76 | Line 76 | check_clean_nick(struct Client *source_p
76		/* Bad nick change */
77		if (IsClient(source_p) && !MyConnect(source_p))
78		{
79	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s KILL %s :%s (Bad Nickname)",
79	>	sendto_server(source_p, 0, 0, ":%s KILL %s :%s (Bad Nickname)",
80		me.id, source_p->id, me.name);
81		AddFlag(source_p, FLAGS_KILLED);
82		exit_client(source_p, "Bad Nickname");
#	Line 237 | Line 237 | change_local_nick(struct Client *source_
237		source_p->host, nick);
238		whowas_add_history(source_p, 1);
239
240	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s NICK %s :%lu",
240	>	sendto_server(source_p, 0, 0, ":%s NICK %s :%lu",
241		source_p->id, nick, (unsigned long)source_p->tsinfo);
242
243		hash_del_client(source_p);
#	Line 287 | Line 287 | change_remote_nick(struct Client *source
287		source_p->host, parv[1]);
288
289		whowas_add_history(source_p, 1);
290	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s NICK %s :%lu",
290	>	sendto_server(source_p, 0, 0, ":%s NICK %s :%lu",
291		source_p->id, parv[1], (unsigned long)source_p->tsinfo);
292
293		/* Set the new nick name */
#	Line 427 | Line 427 | perform_uid_introduction_collides(struct
427
428		sendto_one(source_p, ":%s KILL %s :%s (Nick collision (new))",
429		me.id, uid, me.name);
430	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision (new))",
430	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick collision (new))",
431		me.id, target_p->id, me.name);
432
433		++ServerStats.is_kill;
#	Line 468 | Line 468 | perform_uid_introduction_collides(struct
468		++ServerStats.is_kill;
469		sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
470
471	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision (new))",
471	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick collision (new))",
472		me.id, target_p->id, me.name);
473
474		AddFlag(target_p, FLAGS_KILLED);
#	Line 512 | Line 512 | perform_nick_change_collides(struct Clie
512		sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
513		ServerStats.is_kill += 2;
514
515	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
515	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick change collision)",
516		me.id, source_p->id, me.name);
517	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
517	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick change collision)",
518		me.id, target_p->id, me.name);
519
520		AddFlag(source_p, FLAGS_KILLED);
#	Line 544 | Line 544 | perform_nick_change_collides(struct Clie
544
545		++ServerStats.is_kill;
546
547	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
547	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick change collision)",
548		me.id, source_p->id, me.name);
549		AddFlag(source_p, FLAGS_KILLED);
550
#	Line 566 | Line 566 | perform_nick_change_collides(struct Clie
566		target_p->name, target_p->from->name,
567		source_p->from->name);
568
569	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision)",
569	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (Nick collision)",
570		me.id, target_p->id, me.name);
571
572		++ServerStats.is_kill;
#	Line 819 | Line 819 | ms_uid(struct Client *source_p, int parc
819		target_p->name, target_p->from->name,
820		source_p->from->name);
821
822	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (ID collision)",
822	>	sendto_server(NULL, 0, 0, ":%s KILL %s :%s (ID collision)",
823		me.id, target_p->id, me.name);
824
825		++ServerStats.is_kill;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines