- else {
- for (i=0;i<NICKHASHSIZE;i++) {
- for (np=nicktable[i];np;np=nnp) {
- nnp = np->next;
- if (np->marker == localdata->marker) {
- if (!IsOper(np) && !IsService(np) && !IsXOper(np)) {
- killuser(NULL, np, "You (%s!%s@%s) have been disconnected for violating our terms of service%s", np->nick,
- np->ident, IPtostr(np->p_ipaddr), localdata->reason);
- }
- else
- safe++;
- }
+
+ /* Now do the actual kills */
+ for (i=0;i<NICKHASHSIZE;i++) {
+ for (np=nicktable[i];np;np=nnp) {
+ nnp = np->next;
+
+ if (np->marker != nickmarker)
+ continue;
+
+ if (IsOper(np) || IsService(np) || IsXOper(np)) {
+ safe++;
+ continue;