ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/modules/m_dline.c
(Generate patch)

Comparing ircd-hybrid/trunk/modules/m_dline.c (file contents):
Revision 1652 by michael, Tue Nov 13 20:28:53 2012 UTC vs.
Revision 2340 by michael, Wed Jul 3 13:31:23 2013 UTC

# Line 27 | Line 27
27   #include "channel.h"
28   #include "client.h"
29   #include "irc_string.h"
30 #include "sprintf_irc.h"
30   #include "conf.h"
31   #include "ircd.h"
32   #include "hostmask.h"
# Line 42 | Line 41
41   #include "parse.h"
42   #include "modules.h"
43   #include "conf_db.h"
44 + #include "memory.h"
45  
46  
47   /* apply_tdline()
# Line 112 | Line 112 | remove_dline_match(const char *host)
112    else
113      piphost = NULL;
114  
115 <  if ((conf = find_conf_by_address(host, piphost, CONF_DLINE, aftype, NULL, NULL, 0)))
115 >  if ((conf = find_conf_by_address(host, piphost, CONF_DLINE | 1, aftype, NULL, NULL, 0)))
116    {
117      if (IsConfDatabase(conf))
118      {
# Line 138 | Line 138 | static void
138   mo_dline(struct Client *client_p, struct Client *source_p,
139           int parc, char *parv[])
140   {
141 <  char def_reason[] = "<No reason specified>";
141 >  char def_reason[] = CONF_NOREASON;
142    char *dlhost = NULL, *reason = NULL;
143    char *target_server = NULL;
144    const char *creason;
# Line 274 | Line 274 | static void
274   ms_dline(struct Client *client_p, struct Client *source_p,
275           int parc, char *parv[])
276   {
277 <  char def_reason[] = "<No reason specified>";
277 >  char def_reason[] = CONF_NOREASON;
278    char *dlhost, *reason;
279    const char *creason;
280    const struct Client *target_p = NULL;
# Line 480 | Line 480 | me_undline(struct Client *client_p, stru
480        sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
481                             "%s has removed the D-Line for: [%s]",
482                             get_oper_name(source_p), addr);
483 <      ilog(LOG_TYPE_DLINE, "%s removed temporary D-Line for [%s]",
483 >      ilog(LOG_TYPE_DLINE, "%s removed D-Line for [%s]",
484             get_oper_name(source_p), addr);
485      }
486      else
# Line 497 | Line 497 | ms_undline(struct Client *client_p, stru
497      return;
498  
499    sendto_match_servs(source_p, parv[1], CAP_UNDLN,
500 <                     "UNDLINE %s %s %s",
500 >                     "UNDLINE %s %s",
501                       parv[1], parv[2]);
502  
503    me_undline(client_p, source_p, parc, parv);

Diff Legend

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