ViewVC Help

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

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

Comparing ircd-hybrid/trunk/modules/m_xline.c (file contents):
Revision 1632 by michael, Sun Nov 4 15:37:10 2012 UTC vs.
Revision 1652 by michael, Tue Nov 13 20:28:53 2012 UTC

#	Line 100 | Line 100 | mo_xline(struct Client *client_p, struct
100		target_server, gecos, (int)tkline_time, reason);
101
102		/* Allow ON to apply local xline as well if it matches */
103	<	if (!match(target_server, me.name))
103	>	if (match(target_server, me.name))
104		return;
105		}
106		else
#	Line 193 | Line 193 | relay_xline(struct Client *source_p, cha
193		"XLINE %s %s %s :%s",
194		parv[1], parv[2], parv[3], parv[4]);
195
196	<	if (!match(parv[1], me.name))
196	>	if (match(parv[1], me.name))
197		return;
198
199		if (HasFlag(source_p, FLAGS_SERVICE) || find_matching_name_conf(CONF_ULINE, source_p->servptr->name,
#	Line 248 | Line 248 | mo_unxline(struct Client *client_p, stru
248		"UNXLINE %s %s", target_server, gecos);
249
250		/* Allow ON to apply local unxline as well if it matches */
251	<	if (!match(target_server, me.name))
251	>	if (match(target_server, me.name))
252		return;
253		}
254		else
#	Line 277 | Line 277 | ms_unxline(struct Client *client_p, stru
277		sendto_match_servs(source_p, parv[1], CAP_CLUSTER,
278		"UNXLINE %s %s", parv[1], parv[2]);
279
280	<	if (!match(parv[1], me.name))
280	>	if (match(parv[1], me.name))
281		return;
282
283		if (HasFlag(source_p, FLAGS_SERVICE) || find_matching_name_conf(CONF_ULINE, source_p->servptr->name,
#	Line 332 | Line 332 | write_xline(struct Client *source_p, cha
332		conf = conf_make(CONF_XLINE);
333
334		collapse(gecos);
335	<	DupString(conf->name, gecos);
336	<	DupString(conf->reason, reason);
335	>	conf->name = xstrdup(gecos);
336	>	conf->reason = xstrdup(reason);
337		cur_time = CurrentTime;
338		current_date = smalldate(cur_time);
339		conf->setat = CurrentTime;
#	Line 352 | Line 352 | write_xline(struct Client *source_p, cha
352		ilog(LOG_TYPE_KLINE, "%s added temporary %d min. X-Line for [%s] [%s]",
353		source_p->name, (int)tkline_time/60,
354		conf->name, conf->reason);
355	<	conf->hold = CurrentTime + tkline_time;
355	>	conf->until = CurrentTime + tkline_time;
356		}
357		else
358		{
#	Line 361 | Line 361 | write_xline(struct Client *source_p, cha
361		get_oper_name(source_p), conf->name,
362		conf->reason);
363		sendto_one(source_p,
364	<	":%s NOTICE %s :Added X-Line [%s] [%d] [%s]",
364	>	":%s NOTICE %s :Added X-Line [%s] [%s]",
365		MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
366	<	source_p->name, conf->name,
367	<	conf->action, conf->reason);
366	>	source_p->name, conf->name, conf->reason);
367		ilog(LOG_TYPE_IRCD, "%s added X-Line for [%s] [%s]",
368		get_oper_name(source_p), conf->name, conf->reason);
369		}

Diff Legend

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