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

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 3157 by michael, Fri Mar 14 20:19:36 2014 UTC vs.
Revision 3176 by michael, Tue Mar 18 20:00:16 2014 UTC

# Line 306 | Line 306 | register_local_user(struct Client *sourc
306        ++ServerStats.is_ref;
307        sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308                          "identd to use this server");
309 <      exit_client(source_p, &me, "Install identd");
309 >      exit_client(source_p, "Install identd");
310        return;
311      }
312  
# Line 332 | Line 332 | register_local_user(struct Client *sourc
332        ++ServerStats.is_ref;
333  
334        sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335 <      exit_client(source_p, &me, "Bad Password");
335 >      exit_client(source_p, "Bad Password");
336        return;
337      }
338    }
# Line 363 | Line 363 | register_local_user(struct Client *sourc
363                           "Too many clients, rejecting %s[%s].",
364                           source_p->name, source_p->host);
365      ++ServerStats.is_ref;
366 <    exit_client(source_p, &me, "Sorry, server is full - try later");
366 >    exit_client(source_p, "Sorry, server is full - try later");
367      return;
368    }
369  
# Line 378 | Line 378 | register_local_user(struct Client *sourc
378      ++ServerStats.is_ref;
379      snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
380               source_p->username);
381 <    exit_client(source_p, &me, tmpstr2);
381 >    exit_client(source_p, tmpstr2);
382      return;
383    }
384  
# Line 476 | Line 476 | register_remote_user(struct Client *sour
476                           "No server %s for user %s[%s@%s] from %s",
477                           server, source_p->name, source_p->username,
478                           source_p->host, source_p->from->name);
479 <    kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
479 >    sendto_one(source_p->from,
480 >               ":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
481 >               ID(&me), ID(source_p), me.name, server);
482  
483      AddFlag(source_p, FLAGS_KILLED);
484 <    exit_client(source_p, &me, "Ghosted Client");
484 >    exit_client(source_p, "Ghosted Client");
485      return;
486    }
487  
# Line 490 | Line 492 | register_remote_user(struct Client *sour
492                           source_p->from->name, source_p->name, source_p->username,
493                           source_p->host, source_p->servptr->name,
494                           target_p->name, target_p->from->name);
495 <    kill_client(source_p->from, source_p,
496 <                "%s (NICK from wrong direction (%s != %s))",
497 <                me.name, source_p->servptr->name, target_p->from->name);
495 >    sendto_one(source_p->from,
496 >               ":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
497 >               ID(&me), ID(source_p), me.name, source_p->servptr->name,
498 >               target_p->from->name);
499 >
500      AddFlag(source_p, FLAGS_KILLED);
501 <    exit_client(source_p, &me, "USER server wrong direction");
501 >    exit_client(source_p, "USER server wrong direction");
502      return;
503    }
504  
# Line 1126 | Line 1130 | check_xline(struct Client *source_p)
1130                           source_p->sockhost);
1131  
1132      ++ServerStats.is_ref;
1133 <    exit_client(source_p, &me, "Bad user info");
1133 >    exit_client(source_p, "Bad user info");
1134      return 1;
1135    }
1136  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)