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

Comparing ircd-hybrid/trunk/src/hostmask.c (file contents):
Revision 6410 by michael, Tue Aug 25 19:56:57 2015 UTC vs.
Revision 6411 by michael, Tue Aug 25 20:22:36 2015 UTC

# Line 573 | Line 573 | find_address_conf(const char *host, cons
573     * If they are K-lined, return the K-line. Otherwise, return the
574     * auth {} block. -A1kmm
575     */
576 <  if (killcnf && (killcnf->until == 0 || killcnf->until > CurrentTime))
576 >  if (killcnf)
577      return killcnf;
578  
579    return authcnf;
# Line 589 | Line 589 | struct MaskItem *
589   find_dline_conf(struct irc_ssaddr *addr, int aftype)
590   {
591    struct MaskItem *eline;
592 –  struct MaskItem *dline;
592  
593    eline = find_conf_by_address(NULL, addr, CONF_EXEMPT, aftype, NULL, NULL, 1);
594    if (eline)
595      return eline;
596  
597 <  dline = find_conf_by_address(NULL, addr, CONF_DLINE, aftype, NULL, NULL, 1);
599 <  if (dline && (dline->until == 0 || dline->until > CurrentTime))
600 <    return dline;
601 <
602 <  return NULL;
597 >  return find_conf_by_address(NULL, addr, CONF_DLINE, aftype, NULL, NULL, 1);
598   }
599  
600   /* void add_conf_by_address(int, struct MaskItem *aconf)

Diff Legend

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