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 |
|
|
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); |
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 |
|
} |
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 |
|
|
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 |
|
} |
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)) |
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 |
|
} |
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)"); |
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 |
|
} |