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/s_user.c (file contents):
Revision 1751 by michael, Wed Jan 16 18:30:52 2013 UTC vs.
Revision 2283 by michael, Tue Jun 18 19:13:20 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 53 | Line 52
52		#include "parse.h"
53		#include "watch.h"
54
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
#	Line 77 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79	<	unsigned int user_modes[256] =
79	>	const unsigned int user_modes[256] =
80		{
81		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
82		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 90 | Line 85 | unsigned int user_modes[256] =
85		0,                  /* @ */
86		0,                  /* A */
87		0,                  /* B */
88	<	UMODE_CCONN_FULL,   /* C */
88	>	0,                  /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91	<	0,                  /* F */
91	>	UMODE_FARCONNECT,   /* F */
92		UMODE_SOFTCALLERID, /* G */
93		UMODE_HIDDEN,       /* H */
94		0,                  /* I */
#	Line 106 | Line 101 | unsigned int user_modes[256] =
101		0,                  /* P */
102		0,                  /* Q */
103		UMODE_REGONLY,      /* R */
104	<	0,                  /* S */
104	>	UMODE_SSL,          /* S */
105		0,                  /* T */
106		0,                  /* U */
107		0,                  /* V */
#	Line 120 | Line 115 | unsigned int user_modes[256] =
115		UMODE_BOTS,         /* b */
116		UMODE_CCONN,        /* c */
117		UMODE_DEBUG,        /* d */
118	<	0,                  /* e */
118	>	UMODE_EXTERNAL,     /* e */
119		UMODE_FULL,         /* f */
120		UMODE_CALLERID,     /* g */
121		0,                  /* h */
#	Line 139 | Line 134 | unsigned int user_modes[256] =
134		UMODE_UNAUTH,       /* u */
135		0,                  /* v */
136		UMODE_WALLOP,       /* w */
137	<	UMODE_EXTERNAL,     /* x */
137	>	UMODE_HIDDENHOST,   /* x */
138		UMODE_SPY,          /* y */
139		UMODE_OPERWALL,     /* z      0x7A */
140		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 209 | show_lusers(struct Client *source_p)
209		sendto_one(source_p, form_str(RPL_LUSERME),
210		from, to, Count.local, Count.myserver);
211		sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
212	>	from, to, Count.local, Count.max_loc);
213		}
214		else
215		{
216		sendto_one(source_p, form_str(RPL_LUSERME),
217		from, to, Count.total, 0);
218		sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
219	>	from, to, Count.total, Count.max_tot);
220		}
221
222		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224
225		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
226		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 250 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 397 | Line 393 | register_local_user(struct Client *sourc
393		}
394
395		/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
396	>	if (valid_username(source_p->username, 1) == 0)
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
#	Line 428 | Line 424 | register_local_user(struct Client *sourc
424		get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
431	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
432	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
433	–	source_p->name, source_p->username, source_p->host,
434	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
435	–	"255.255.255.255" : source_p->sockhost,
436	–	get_client_class(&source_p->localClient->confs),
437	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
438	–	"<hidden>" : source_p->localClient->client_host,
439	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	–	"<hidden>" : source_p->localClient->client_server,
441	–	source_p->info);
442	–
443	–
427		if (ConfigFileEntry.invisible_on_connect)
428		{
429		AddUMode(source_p, UMODE_INVISIBLE);
#	Line 558 | Line 541 | register_remote_user(struct Client *sour
541		add_user_host(source_p->username, source_p->host, 1);
542		SetUserHost(source_p);
543
544	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
545	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	+	source_p->servptr->name,
548	+	source_p->name, source_p->username, source_p->host,
549	+	source_p->info, source_p->id);
550	+
551		introduce_client(source_p);
552		}
553
#	Line 633 | Line 623 | introduce_client(struct Client *source_p
623		ubuf, source_p->username, source_p->host,
624		source_p->servptr->name, source_p->info);
625		}
626	+
627	+	if (!EmptyString(source_p->certfp))
628	+	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629		}
630		}
631
#	Line 659 | Line 652 | valid_hostname(const char *hostname)
652		if (!IsHostChar(*p))
653		return 0;
654
655	<	return 1;
655	>	return p - hostname <= HOSTLEN;
656		}
657
658		/* valid_username()
#	Line 674 | Line 667 | valid_hostname(const char *hostname)
667		* style of username
668		*/
669		int
670	<	valid_username(const char *username)
670	>	valid_username(const char *username, const int local)
671		{
672		int dots      = 0;
673		const char *p = username;
#	Line 684 | Line 677 | valid_username(const char *username)
677		if (*p == '~')
678		++p;
679
680	<	/* reject usernames that don't start with an alphanum
680	>	/*
681	>	* Reject usernames that don't start with an alphanum
682		* i.e. reject jokers who have '-@somehost' or '.@somehost'
683		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
684		*/
685		if (!IsAlNum(*p))
686		return 0;
687
688	<	while (*++p)
688	>	if (local)
689		{
690	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
690	>	while (*++p)
691		{
692	<	if (++dots > ConfigFileEntry.dots_in_ident)
693	<	return 0;
694	<	if (!IsUserChar(*(p + 1)))
692	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
693	>	{
694	>	if (++dots > ConfigFileEntry.dots_in_ident)
695	>	return 0;
696	>	if (!IsUserChar(*(p + 1)))
697	>	return 0;
698	>	}
699	>	else if (!IsUserChar(*p))
700		return 0;
701		}
702	<	else if (!IsUserChar(*p))
703	<	return 0;
702	>	}
703	>	else
704	>	{
705	>	while (*++p)
706	>	if (!IsUserChar(*p))
707	>	return 0;
708		}
709
710	<	return 1;
710	>	return  p - username <= USERLEN;;
711		}
712
713		/* clean_nick_name()
#	Line 745 | Line 748 | report_and_set_user_flags(struct Client
748		{
749		/* If this user is being spoofed, tell them so */
750		if (IsConfDoSpoofIp(conf))
748	–	{
751		sendto_one(source_p,
752	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753		me.name, source_p->name);
752	–	}
754
755		/* If this user is in the exception class, Set it "E lined" */
756		if (IsConfExemptKline(conf))
757		{
758		SetExemptKline(source_p);
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761		me.name, source_p->name);
762		}
763
#	Line 766 | Line 767 | report_and_set_user_flags(struct Client
767		else if (IsConfExemptGline(conf))
768		{
769		SetExemptGline(source_p);
770	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
770	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
771		me.name, source_p->name);
772		}
773
774		if (IsConfExemptResv(conf))
775		{
776		SetExemptResv(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
778		me.name, source_p->name);
779		}
780
#	Line 782 | Line 783 | report_and_set_user_flags(struct Client
783		{
784		SetExemptLimits(source_p);
785		sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
786	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
787		me.name,source_p->name);
788		}
789
#	Line 795 | Line 796 | report_and_set_user_flags(struct Client
796		}
797		}
798
798	–	/* change_simple_umode()
799	–	*
800	–	* this callback can be hooked to allow special handling of
801	–	* certain usermodes
802	–	*/
803	–	static void *
804	–	change_simple_umode(va_list args)
805	–	{
806	–	struct Client *client_p;
807	–	struct Client *source_p;
808	–	int what;
809	–	unsigned int flag;
810	–
811	–	client_p = va_arg(args, struct Client *);
812	–	source_p = va_arg(args, struct Client *);
813	–	what = va_arg(args, int);
814	–	flag = va_arg(args, unsigned int);
815	–
816	–	if (what == MODE_ADD)
817	–	AddUMode(source_p, flag);
818	–	else
819	–	DelUMode(source_p, flag);
820	–
821	–	return NULL;
822	–	}
823	–
799		/* set_user_mode()
800		*
801		* added 15/10/91 By Darren Reed.
#	Line 830 | Line 805 | change_simple_umode(va_list args)
805		*/
806		void
807		set_user_mode(struct Client *client_p, struct Client *source_p,
808	<	int parc, char *parv[])
808	>	const int parc, char *parv[])
809		{
810		unsigned int flag, setflags;
811		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 847 | Line 822 | set_user_mode(struct Client *client_p, s
822		return;
823		}
824
850	–	if (IsServer(source_p))
851	–	{
852	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
853	–	"*** Mode for User %s from %s",
854	–	parv[1], source_p->name);
855	–	return;
856	–	}
857	–
825		if (source_p != target_p)
826		{
827		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 877 | Line 844 | set_user_mode(struct Client *client_p, s
844		return;
845		}
846
880	–	execute_callback(entering_umode_cb, client_p, source_p);
881	–
847		/* find flags already set for user */
848		setflags = source_p->umodes;
849
#	Line 930 | Line 895 | set_user_mode(struct Client *client_p, s
895
896		break;
897
898	<	/* we may not get these,
899	<	* but they shouldnt be in default
900	<	*/
936	<	case 'r':
937	<	case ' ' :
938	<	case '\n':
939	<	case '\r':
940	<	case '\t':
898	>	case 'S':  /* Only servers may set +S in a burst */
899	>	case 'r':  /* Only services may set +r */
900	>	case 'x':  /* Only services may set +x */
901		break;
902
903		default:
#	Line 945 | Line 905 | set_user_mode(struct Client *client_p, s
905		{
906		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
907		(ConfigFileEntry.oper_only_umodes & flag))
948	–	{
908		badflag = 1;
950	–	}
909		else
910	<	execute_callback(umode_cb, client_p, source_p, what, flag);
910	>	{
911	>	if (what == MODE_ADD)
912	>	AddUMode(source_p, flag);
913	>	else
914	>	DelUMode(source_p, flag);
915	>	}
916		}
917		else
918		{
#	Line 966 | Line 929 | set_user_mode(struct Client *client_p, s
929		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
930		me.name, source_p->name);
931
969	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
970	–	{
971	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
972	–	me.name, source_p->name);
973	–	DelUMode(source_p, UMODE_NCHANGE);
974	–	}
975	–
932		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
933		!HasOFlag(source_p, OPER_FLAG_ADMIN))
934		{
#	Line 1090 | Line 1046 | send_umode_out(struct Client *client_p,
1046		send_umode(client_p, source_p, old, 0xffffffff, buf);
1047		}
1048
1049	+	void
1050	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1051	+	{
1052	+	dlink_node *ptr = NULL;
1053	+
1054	+	if (!strcmp(target_p->host, hostname))
1055	+	return;
1056	+
1057	+	switch (what)
1058	+	{
1059	+	case MODE_ADD:
1060	+	AddUMode(target_p, UMODE_HIDDENHOST);
1061	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1062	+	break;
1063	+	case MODE_DEL:
1064	+	DelUMode(target_p, UMODE_HIDDENHOST);
1065	+
1066	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1067	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1068	+	break;
1069	+	default: return;
1070	+	}
1071	+
1072	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1073	+	target_p->name, target_p->username, target_p->host);
1074	+
1075	+	if (IsUserHostIp(target_p))
1076	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1077	+
1078	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1079	+
1080	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1081	+	SetUserHost(target_p);
1082	+
1083	+	if (MyClient(target_p))
1084	+	{
1085	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1086	+	target_p->name, target_p->host);
1087	+	clear_ban_cache_client(target_p);
1088	+	}
1089	+
1090	+	if (!ConfigFileEntry.cycle_on_host_change)
1091	+	return;
1092	+
1093	+	DLINK_FOREACH(ptr, target_p->channel.head)
1094	+	{
1095	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1096	+	char *p = modebuf;
1097	+	int len = 0;
1098	+	const struct Membership *ms = ptr->data;
1099	+
1100	+	if (has_member_flags(ms, CHFL_CHANOP))
1101	+	{
1102	+	*p++ = 'o';
1103	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1104	+	}
1105	+
1106	+	if (has_member_flags(ms, CHFL_HALFOP))
1107	+	{
1108	+	*p++ = 'h';
1109	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1110	+	}
1111	+
1112	+	if (has_member_flags(ms, CHFL_VOICE))
1113	+	{
1114	+	*p++ = 'v';
1115	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1116	+	}
1117	+
1118	+	*p = '\0';
1119	+
1120	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1121	+	target_p->name, target_p->username, target_p->host,
1122	+	ms->chptr->chname);
1123	+	if (nickbuf[0])
1124	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1125	+	target_p->servptr->name, ms->chptr->chname,
1126	+	modebuf, nickbuf);
1127	+
1128	+	}
1129	+
1130	+	if (target_p->away[0])
1131	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1132	+	":%s!%s@%s AWAY :%s",
1133	+	target_p->name, target_p->username,
1134	+	target_p->host, target_p->away);
1135	+	}
1136	+
1137		/* user_welcome()
1138		*
1139		* inputs       - client pointer to client to welcome
#	Line 1106 | Line 1150 | user_welcome(struct Client *source_p)
1150		#endif
1151
1152		#ifdef HAVE_LIBCRYPTO
1153	<	if (source_p->localClient->fd.ssl != NULL)
1153	>	if (HasFlag(source_p, FLAGS_SSL))
1154	>	{
1155	>	AddUMode(source_p, UMODE_SSL);
1156		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1157		me.name, source_p->name,
1158		ssl_get_cipher(source_p->localClient->fd.ssl));
1159	+	}
1160		#endif
1161
1162		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
#	Line 1127 | Line 1174 | user_welcome(struct Client *source_p)
1174		source_p->name, source_p->id);
1175
1176		show_lusers(source_p);
1177	<
1131	<	if (ConfigFileEntry.short_motd)
1132	<	{
1133	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1134	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1135	<	sendto_one(source_p,
1136	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1137	<	"read it", me.name, source_p->name);
1138	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1139	<	me.name, source_p->name, me.name);
1140	<	sendto_one(source_p, form_str(RPL_MOTD),
1141	<	me.name, source_p->name,
1142	<	"*** This is the short motd ***");
1143	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1144	<	me.name, source_p->name);
1145	<	}
1146	<	else
1147	<	send_message_file(source_p, &ConfigFileEntry.motd);
1177	>	motd_signon(source_p);
1178		}
1179
1180		/* check_xline()
#	Line 1159 | Line 1189 | check_xline(struct Client *source_p)
1189		struct MaskItem *conf = NULL;
1190		const char *reason = NULL;
1191
1192	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1163	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1192	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1193		{
1194		++conf->count;
1195
#	Line 1219 | Line 1248 | oper_up(struct Client *source_p)
1248
1249		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1250		AddUMode(source_p, UMODE_ADMIN);
1222	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1223	–	DelUMode(source_p, UMODE_NCHANGE);
1251
1252		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1253		get_oper_name(source_p));
#	Line 1253 | Line 1280 | valid_sid(const char *sid)
1280		void
1281		init_uid(void)
1282		{
1283	<	int i;
1283	>	unsigned int i;
1284
1285		memset(new_uid, 0, sizeof(new_uid));
1286
#	Line 1270 | Line 1297 | init_uid(void)
1297		* -Dianora
1298		*/
1299		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1273	–
1274	–	entering_umode_cb = register_callback("entering_umode", NULL);
1275	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1300		}
1301
1302		/*
#	Line 1332 | Line 1356 | uid_get(void)
1356		void
1357		init_isupport(void)
1358		{
1335	–	isupportFile = init_MessageLine();
1336	–
1359		add_isupport("CALLERID", NULL, -1);
1360		add_isupport("CASEMAPPING", CASEMAP, -1);
1361		add_isupport("DEAF", "D", -1);
#	Line 1346 | Line 1368 | init_isupport(void)
1368		add_isupport("PREFIX", "(ov)@+", -1);
1369		add_isupport("STATUSMSG", "@+", -1);
1370		#endif
1371	+	add_isupport("EXCEPTS", "e", -1);
1372	+	add_isupport("INVEX", "I", -1);
1373		}
1374
1375		/*
#	Line 1429 | Line 1453 | rebuild_isupport_message_line(void)
1453		{
1454		char isupportbuffer[IRCD_BUFSIZE];
1455		char *p = isupportbuffer;
1456	<	dlink_node *ptr = NULL;
1456	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1457		int n = 0;
1458		int tokens = 0;
1459		size_t len = 0;
1460		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1461
1462	<	destroy_MessageLine(isupportFile);
1462	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1463	>	{
1464	>	dlinkDelete(ptr, &support_list_lines);
1465	>	MyFree(ptr->data);
1466	>	free_dlink_node(ptr);
1467	>	}
1468
1469		DLINK_FOREACH(ptr, support_list.head)
1470		{
1471		struct Isupport *support = ptr->data;
1472
1473	<	p += (n = ircsprintf(p, "%s", support->name));
1473	>	p += (n = sprintf(p, "%s", support->name));
1474		len += n;
1475
1476		if (support->options != NULL)
1477		{
1478	<	p += (n = ircsprintf(p, "=%s", support->options));
1478	>	p += (n = sprintf(p, "=%s", support->options));
1479		len += n;
1480		}
1481
1482		if (support->number > 0)
1483		{
1484	<	p += (n = ircsprintf(p, "=%d", support->number));
1484	>	p += (n = sprintf(p, "=%d", support->number));
1485		len += n;
1486		}
1487
#	Line 1465 | Line 1494 | rebuild_isupport_message_line(void)
1494		if (*--p == ' ')
1495		*p = '\0';
1496
1497	<	addto_MessageLine(isupportFile, isupportbuffer);
1497	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1498		p = isupportbuffer;
1499		len = 0;
1500		n = tokens = 0;
#	Line 1476 | Line 1505 | rebuild_isupport_message_line(void)
1505		{
1506		if (*--p == ' ')
1507		*p = '\0';
1508	<	addto_MessageLine(isupportFile, isupportbuffer);
1508	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1509		}
1510		}

Diff Legend

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