/[svn]/ircd-hybrid-8/modules/m_kline.c
ViewVC logotype

Diff of /ircd-hybrid-8/modules/m_kline.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1297 by michael, Mon Jan 30 23:55:11 2012 UTC revision 1298 by michael, Tue Feb 28 18:51:13 2012 UTC
# Line 63  static int remove_tkline_match(const cha Line 63  static int remove_tkline_match(const cha
63   */   */
64  static void  static void
65  mo_kline(struct Client *client_p, struct Client *source_p,  mo_kline(struct Client *client_p, struct Client *source_p,
66           int parc, char **parv)           int parc, char *parv[])
67  {  {
68    char *reason = NULL;    char *reason = NULL;
69    char *oper_reason;    char *oper_reason;
# Line 323  already_placed_kline(struct Client *sour Line 323  already_placed_kline(struct Client *sour
323                   me.name, source_p->name, luser, lhost, aconf->user,                   me.name, source_p->name, luser, lhost, aconf->user,
324                   aconf->host, reason);                   aconf->host, reason);
325      }      }
326      return(1);  
327        return 1;
328    }    }
329    
330    return(0);    return 0;
331  }  }
332    
333  /*  /*
# Line 493  remove_tkline_match(const char *host, co Line 494  remove_tkline_match(const char *host, co
494    dlink_node *tk_n;    dlink_node *tk_n;
495    struct irc_ssaddr addr, caddr;    struct irc_ssaddr addr, caddr;
496    int nm_t, cnm_t, bits, cbits;    int nm_t, cnm_t, bits, cbits;
497    
498    nm_t = parse_netmask(host, &addr, &bits);    nm_t = parse_netmask(host, &addr, &bits);
499    
500    DLINK_FOREACH(tk_n, temporary_klines.head)    DLINK_FOREACH(tk_n, temporary_klines.head)
501    {    {
502      tk_c = map_to_conf(tk_n->data);      tk_c  = map_to_conf(tk_n->data);
503      cnm_t = parse_netmask(tk_c->host, &caddr, &cbits);      cnm_t = parse_netmask(tk_c->host, &caddr, &cbits);
504    
505      if (cnm_t != nm_t || irccmp(user, tk_c->user))      if (cnm_t != nm_t || irccmp(user, tk_c->user))
506        continue;        continue;
507      if ((nm_t==HM_HOST && !irccmp(tk_c->host, host)) ||  
508          (nm_t==HM_IPV4 && bits==cbits && match_ipv4(&addr, &caddr, bits))      if ((nm_t == HM_HOST && !irccmp(tk_c->host, host)) ||
509            (nm_t == HM_IPV4 && bits == cbits && match_ipv4(&addr, &caddr, bits))
510  #ifdef IPV6  #ifdef IPV6
511         || (nm_t==HM_IPV6 && bits==cbits && match_ipv6(&addr, &caddr, bits))       || (nm_t == HM_IPV6 && bits == cbits && match_ipv6(&addr, &caddr, bits))
512  #endif  #endif
513         )         )
514        {        {
Legend:
Removed from v.1297  
changed lines
  Added in v.1298
svnadmin@ircd-hybrid.org
 ViewVC Help
Powered by ViewVC 1.1.30