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
(Generate patch)

Comparing ircd-hybrid/trunk/modules/core/m_nick.c (file contents):
Revision 3175 by michael, Tue Mar 18 19:48:30 2014 UTC vs.
Revision 3178 by michael, Wed Mar 19 18:27:44 2014 UTC

# Line 79 | Line 79 | check_clean_nick(struct Client *source_p
79      /* bad nick change */
80      if (!MyConnect(source_p))
81      {
82 <      kill_client_serv_butone(source_p, source_p,
83 <                              "%s (Bad Nickname)",
84 <                              me.name);
82 >      sendto_server(source_p, NOCAPS, NOCAPS, ":%s KILL %s :%s (Bad Nickname)",
83 >                    me.id, source_p->id, me.name);
84        AddFlag(source_p, FLAGS_KILLED);
85        exit_client(source_p, "Bad Nickname");
86      }
# Line 405 | Line 404 | perform_nick_collides(struct Client *sou
404          sendto_one(source_p, ":%s KILL %s :%s (Nick collision (new))",
405                     me.id, uid, me.name);
406  
407 <      kill_client_serv_butone(NULL, target_p,
408 <                              "%s (Nick collision (new))", me.name);
407 >      sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision (new))",
408 >                    me.id, target_p->id, me.name);
409 >
410        ++ServerStats.is_kill;
411        sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
412  
# Line 449 | Line 449 | perform_nick_collides(struct Client *sou
449          ++ServerStats.is_kill;
450          sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
451  
452 <        kill_client_serv_butone(NULL, target_p,
453 <                                "%s (Nick collision (new))", me.name);
452 >        sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision (new))",
453 >                      me.id, target_p->id, me.name);
454  
455          AddFlag(target_p, FLAGS_KILLED);
456          exit_client(target_p, "Nick collision");
# Line 475 | Line 475 | perform_nick_collides(struct Client *sou
475        sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
476        ++ServerStats.is_kill;
477  
478 <      kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)",
479 <                              me.name);
478 >
479 >      sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
480 >                    me.id, source_p->id, me.name);
481  
482        ++ServerStats.is_kill;
483 <      kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)",
484 <                              me.name);
483 >
484 >      sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
485 >                    me.id, target_p->id, me.name);
486  
487        AddFlag(target_p, FLAGS_KILLED);
488        exit_client(target_p, "Nick collision (new)");
# Line 509 | Line 511 | perform_nick_collides(struct Client *sou
511               source_p->from->name);
512  
513        ++ServerStats.is_kill;
514 <      kill_client_serv_butone(NULL, source_p,
515 <                              "%s (Nick change collision)", me.name);
514 >
515 >      sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick change collision)",
516 >                    me.id, source_p->id, me.name);
517        AddFlag(source_p, FLAGS_KILLED);
518  
519        if (sameuser)
# Line 532 | Line 535 | perform_nick_collides(struct Client *sou
535                               target_p->name, target_p->from->name,
536                               source_p->from->name);
537  
538 <      kill_client_serv_butone(NULL, target_p, "%s (Nick collision)", me.name);
538 >      sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (Nick collision)",
539 >                    me.id, target_p->id, me.name);
540  
541        ++ServerStats.is_kill;
542        sendto_one_numeric(target_p, &me, ERR_NICKCOLLISION, target_p->name);
# Line 803 | Line 807 | ms_uid(struct Client *source_p, int parc
807                           "ID collision on %s(%s <- %s)(both killed)",
808                           target_p->name, target_p->from->name,
809                           source_p->from->name);
810 <    kill_client_serv_butone(NULL, target_p, "%s (ID collision)",
811 <                            me.name);
810 >
811 >    sendto_server(NULL, NOCAPS, NOCAPS, ":%s KILL %s :%s (ID collision)",
812 >                  me.id, target_p->id, me.name);
813  
814      ++ServerStats.is_kill;
815      AddFlag(target_p, FLAGS_KILLED);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines