ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/modules/m_dline.c

Comparing ircd-hybrid/trunk/modules/m_dline.c (file contents):
Revision 1649 by michael, Sat Nov 10 19:27:13 2012 UTC vs.
Revision 1703 by michael, Sun Dec 23 14:26:36 2012 UTC

#	Line 42 | Line 42
42		#include "parse.h"
43		#include "modules.h"
44		#include "conf_db.h"
45	+	#include "memory.h"
46
47
48		/* apply_tdline()
#	Line 112 | Line 113 | remove_dline_match(const char *host)
113		else
114		piphost = NULL;
115
116	<	if ((conf = find_conf_by_address(host, piphost, CONF_DLINE, aftype, NULL, NULL, 0)))
116	>	if ((conf = find_conf_by_address(host, piphost, CONF_DLINE | 1, aftype, NULL, NULL, 0)))
117		{
118		if (IsConfDatabase(conf))
119		{
#	Line 183 | Line 184 | mo_dline(struct Client *client_p, struct
184		dlhost, reason);
185
186		/* Allow ON to apply local kline as well if it matches */
187	<	if (!match(target_server, me.name))
187	>	if (match(target_server, me.name))
188		return;
189		}
190		else
#	Line 296 | Line 297 | ms_dline(struct Client *client_p, struct
297		"DLINE %s %s %s :%s",
298		parv[1], parv[2], parv[3], parv[4]);
299
300	<	if (!match(parv[1], me.name))
300	>	if (match(parv[1], me.name))
301		return;
302
303		tkline_time = valid_tkline(parv[2], TK_SECONDS);
#	Line 430 | Line 431 | mo_undline(struct Client *client_p, stru
431		"UNDLINE %s %s", target_server, addr);
432
433		/* Allow ON to apply local unkline as well if it matches */
434	<	if (!match(target_server, me.name))
434	>	if (match(target_server, me.name))
435		return;
436		}
437		else
#	Line 464 | Line 465 | me_undline(struct Client *client_p, stru
465
466		addr = parv[2];
467
468	<	if (!IsClient(source_p) || !match(parv[1], me.name))
468	>	if (!IsClient(source_p) || match(parv[1], me.name))
469		return;
470
471		if (HasFlag(source_p, FLAGS_SERVICE) || find_matching_name_conf(CONF_ULINE,

Diff Legend

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