ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/modules/core/m_nick.c
(Generate patch)

Comparing ircd-hybrid-8/modules/core/m_nick.c (file contents):
Revision 1196 by michael, Sun Aug 21 10:09:23 2011 UTC vs.
Revision 1219 by michael, Sun Sep 18 09:02:38 2011 UTC

# Line 154 | Line 154 | change_local_nick(struct Client *source_
154        (source_p->localClient->number_of_nick_changes
155         <= ConfigFileEntry.max_nick_changes)) ||
156       !ConfigFileEntry.anti_nick_flood ||
157 <     (IsOper(source_p) && ConfigFileEntry.no_oper_flood))
157 >     (HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.no_oper_flood))
158    {
159      int samenick = !irccmp(source_p->name, nick);
160  
# Line 316 | Line 316 | m_nick(struct Client *client_p, struct C
316  
317    if (find_matching_name_conf(NRESV_TYPE, nick,
318                               NULL, NULL, 0) && !IsExemptResv(source_p) &&
319 <     !(IsOper(source_p) && ConfigFileEntry.oper_pass_resv))
319 >     !(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
320    {
321      sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
322                 me.name, source_p->name, nick);
# Line 529 | Line 529 | ms_uid(struct Client *client_p, struct C
529                                 me.name);
530  
531      ++ServerStats.is_kill;
532 <    SetKilled(target_p);
532 >    AddFlag(target_p, FLAGS_KILLED);
533      exit_client(target_p, &me, "ID Collision");
534      return;
535    }
# Line 581 | Line 581 | check_clean_nick(struct Client *client_p
581        kill_client_ll_serv_butone(client_p, source_p,
582                                   "%s (Bad Nickname)",
583                                   me.name);
584 <      SetKilled(source_p);
584 >      AddFlag(source_p, FLAGS_KILLED);
585        exit_client(source_p, &me, "Bad Nickname");
586      }
587  
# Line 846 | Line 846 | perform_nick_collides(struct Client *sou
846        sendto_one(target_p, form_str(ERR_NICKCOLLISION),
847                   me.name, target_p->name, target_p->name);
848  
849 <      SetKilled(target_p);
849 >      AddFlag(target_p, FLAGS_KILLED);
850        exit_client(target_p, &me, "Nick collision (new)");
851        return;
852      }
# Line 892 | Line 892 | perform_nick_collides(struct Client *sou
892                                     "%s (Nick collision (new))",
893                                     me.name);
894  
895 <        SetKilled(target_p);
895 >        AddFlag(target_p, FLAGS_KILLED);
896          exit_client(target_p, &me, "Nick collision");
897          
898          if (!uid && (parc == 9 || parc == 10))
# Line 924 | Line 924 | perform_nick_collides(struct Client *sou
924        kill_client_ll_serv_butone(NULL, target_p, "%s (Nick change collision)",
925                                   me.name);
926  
927 <      SetKilled(target_p);
927 >      AddFlag(target_p, FLAGS_KILLED);
928        exit_client(target_p, &me, "Nick collision (new)");
929  
930 <      SetKilled(source_p);
930 >      AddFlag(source_p, FLAGS_KILLED);
931        exit_client(source_p, &me, "Nick collision (old)");
932        return;
933      }
# Line 955 | Line 955 | perform_nick_collides(struct Client *sou
955                                     "%s (Nick change collision)",
956                                     me.name);
957  
958 <        SetKilled(source_p);
958 >        AddFlag(source_p, FLAGS_KILLED);
959          
960          if (sameuser)
961            exit_client(source_p, &me, "Nick collision (old)");
# Line 984 | Line 984 | perform_nick_collides(struct Client *sou
984         sendto_one(target_p, form_str(ERR_NICKCOLLISION),
985                    me.name, target_p->name, target_p->name);
986  
987 <       SetKilled(target_p);
987 >       AddFlag(target_p, FLAGS_KILLED);
988         exit_client(target_p, &me, "Nick collision");
989       }
990     }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines