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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 2678 by michael, Sun Dec 15 12:17:23 2013 UTC vs.
Revision 2739 by michael, Sat Jan 4 20:04:27 2014 UTC

# Line 52 | Line 52
52   #include "userhost.h"
53   #include "watch.h"
54   #include "rng_mt.h"
55 + #include "parse.h"
56  
57   dlink_list listing_client_list = { NULL, NULL, 0 };
58   /* Pointer to beginning of Client list */
# Line 239 | Line 240 | check_pings(void *notused)
240   static void
241   check_pings_list(dlink_list *list)
242   {
243 <  char scratch[32];        /* way too generous but... */
243 >  char scratch[IRCD_BUFSIZE];
244    int ping = 0;      /* ping time value from client */
245    dlink_node *ptr = NULL, *next_ptr = NULL;
246  
# Line 363 | Line 364 | check_conf_klines(void)
364  
365      if (ConfigFileEntry.glines)
366      {
367 <      if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
368 <                                        CONF_GLINE, client_p->localClient->aftype,
369 <                                        client_p->username, NULL, 1)))
369 <        continue;
370 <
371 <      if (IsExemptKline(client_p) ||
372 <          IsExemptGline(client_p))
367 >      if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
368 >                                       CONF_GLINE, client_p->localClient->aftype,
369 >                                       client_p->username, NULL, 1)))
370        {
371 <        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
372 <                             "GLINE over-ruled for %s, client is %sline_exempt",
373 <                             get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
371 >        if (IsExemptKline(client_p) ||
372 >            IsExemptGline(client_p))
373 >        {
374 >          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
375 >                               "GLINE over-ruled for %s, client is %sline_exempt",
376 >                               get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
377 >          continue;
378 >        }
379 >
380 >        ban_them(client_p, conf);
381 >        /* and go examine next fd/client_p */
382          continue;
383        }
379 –
380 –      ban_them(client_p, conf);
381 –      /* and go examine next fd/client_p */
382 –      continue;
384      }
385  
386      if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
387                                       CONF_KLINE, client_p->localClient->aftype,
388 <                                     client_p->username, NULL, 1)) != NULL)
388 >                                     client_p->username, NULL, 1)))
389      {
390        if (IsExemptKline(client_p))
391        {
# Line 997 | Line 998 | dead_link_on_write(struct Client *client
998   void
999   dead_link_on_read(struct Client *client_p, int error)
1000   {
1001 <  char errmsg[255];
1001 >  char errmsg[IRCD_BUFSIZE];
1002    int current_error;
1003  
1004    if (IsDefunct(client_p))

Diff Legend

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