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

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 5847 by michael, Sun Apr 26 19:02:58 2015 UTC vs.
Revision 5871 by michael, Tue Apr 28 20:35:50 2015 UTC

# Line 1036 | Line 1036 | expire_tklines(dlink_list *list)
1036      if (!conf->until || conf->until > CurrentTime)
1037        continue;
1038  
1039 <    if (conf->type == CONF_XLINE)
1040 <    {
1041 <      if (ConfigGeneral.tkline_expire_notices)
1042 <        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1043 <                             "Temporary X-line for [%s] expired", conf->name);
1044 <      conf_free(conf);
1045 <    }
1046 <    else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1047 <    {
1048 <      if (ConfigGeneral.tkline_expire_notices)
1049 <        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1050 <                             "Temporary RESV for [%s] expired", conf->name);
1051 <      conf_free(conf);
1052 <    }
1039 >    if (ConfigGeneral.tkline_expire_notices)
1040 >      sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1041 >                           (conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1042 >    conf_free(conf);
1043    }
1044   }
1045  

Diff Legend

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