ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/user.c

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 5805 by michael, Tue Apr 21 21:49:58 2015 UTC vs.
Revision 6156 by michael, Thu Jun 18 09:19:25 2015 UTC

#	Line 197 | Line 197 | report_and_set_user_flags(struct Client
197		if (IsConfExemptKline(conf))
198		{
199		SetExemptKline(source_p);
200	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
200	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
201	>	}
202	>
203	>	if (IsConfExemptXline(conf))
204	>	{
205	>	SetExemptXline(source_p);
206	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
207		}
208
209		if (IsConfExemptResv(conf))
#	Line 325 | Line 331 | check_xline(struct Client *source_p)
331		{
332		struct MaskItem *conf = NULL;
333
334	+	if (IsExemptXline(source_p))
335	+	return 0;
336	+
337		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
338		{
339		++conf->count;
#	Line 930 | Line 939 | valid_sid(const char *sid)
939		* side effects - new_uid is filled in with server id portion (sid)
940		*                (first 3 bytes). Rest is filled in with '9'.
941		*
933	–	* NOTE: this function assumes that 'ConfigServerInfo.sid' has been set to a proper value
942		*/
943		void
944		init_uid(void)
945		{
946	<	snprintf(new_uid, sizeof(new_uid), "%s999999", ConfigServerInfo.sid);
946	>	snprintf(new_uid, sizeof(new_uid), "%s999999", me.id);
947		}
948
949		/*

Diff Legend

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